aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-02-07 16:32:15 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-02-07 16:32:15 +0000
commit458bd5b3cdec51fd64f4a4056cb419bbbc099907 (patch)
treefe30370aa6eb79211c9a36ac60abdb54f2bfcae4 /phpBB/includes
parent0fc55efc7d887a07061b52456bfb01e0bc298d9a (diff)
downloadforums-458bd5b3cdec51fd64f4a4056cb419bbbc099907.tar
forums-458bd5b3cdec51fd64f4a4056cb419bbbc099907.tar.gz
forums-458bd5b3cdec51fd64f4a4056cb419bbbc099907.tar.bz2
forums-458bd5b3cdec51fd64f4a4056cb419bbbc099907.tar.xz
forums-458bd5b3cdec51fd64f4a4056cb419bbbc099907.zip
fix permission bug for added categories during conversion as well as lowering the maximum execution limit.
git-svn-id: file:///svn/phpbb/trunk@6972 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_convert.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index 64cb63de3a..01ca16d1e8 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -34,10 +34,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 = 250;
+ $max_execution_time = 65;
}
- $max_execution_time = min(max(10, ($max_execution_time - 15)), 250);
+ $max_execution_time = min(max(10, ($max_execution_time - 15)), 50);
// For debugging purposes
// $max_execution_time = 10;