aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2007-03-04 16:05:17 +0000
committerNils Adermann <naderman@naderman.de>2007-03-04 16:05:17 +0000
commitac21b7d47b4c8783a41ba4dbf8d26971c252c6d1 (patch)
tree8110ad6a167a84c7c6d0a849ec9fa645ed5b1178 /phpBB/includes/functions.php
parent567b01302b735c03e596be1b1b7d01261084c62b (diff)
downloadforums-ac21b7d47b4c8783a41ba4dbf8d26971c252c6d1.tar
forums-ac21b7d47b4c8783a41ba4dbf8d26971c252c6d1.tar.gz
forums-ac21b7d47b4c8783a41ba4dbf8d26971c252c6d1.tar.bz2
forums-ac21b7d47b4c8783a41ba4dbf8d26971c252c6d1.tar.xz
forums-ac21b7d47b4c8783a41ba4dbf8d26971c252c6d1.zip
- added a UNIQUE index on the wordmatch table
- some modifications of search indexing which might improve the speed and hopefully fixes [Bug #8352] - added logging to search indexing [Bug #8384] git-svn-id: file:///svn/phpbb/trunk@7119 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 04a2e20dce..2e8c87c04e 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -180,7 +180,7 @@ function unique_id($extra = 'c')
* @return bool Either true if the maximum execution time is nearly reached, or false
* if some time is still left.
*/
-function still_on_time()
+function still_on_time($extra_time = 15)
{
static $max_execution_time, $start_time;
@@ -194,10 +194,10 @@ function still_on_time()
// If zero, then set to something higher to not let the user catch the ten seconds barrier.
if ($max_execution_time === 0)
{
- $max_execution_time = 65;
+ $max_execution_time = 50 + $extra_time;
}
- $max_execution_time = min(max(10, ($max_execution_time - 15)), 50);
+ $max_execution_time = min(max(10, ($max_execution_time - $extra_time)), 50);
// For debugging purposes
// $max_execution_time = 10;