aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2013-10-16 11:08:33 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2013-10-16 11:08:33 -0500
commitd062402c4b4a97a7ab4b6d2f316d4d14d8faf70b (patch)
tree03cd57f4ca5cbb85f0d40b156e6f225df6287bba /phpBB/install
parent3e694f784d490eeec2fe71015a16316db4a17cb9 (diff)
downloadforums-d062402c4b4a97a7ab4b6d2f316d4d14d8faf70b.tar
forums-d062402c4b4a97a7ab4b6d2f316d4d14d8faf70b.tar.gz
forums-d062402c4b4a97a7ab4b6d2f316d4d14d8faf70b.tar.bz2
forums-d062402c4b4a97a7ab4b6d2f316d4d14d8faf70b.tar.xz
forums-d062402c4b4a97a7ab4b6d2f316d4d14d8faf70b.zip
[ticket/11902] Prevent errors if set_time_limit disabled
PHPBB3-11902
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/database_update.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 2526657bf9..07a8ed7a1e 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -210,7 +210,7 @@ $safe_time_limit = min(15, (ini_get('max_execution_time') / 2));
// we want to try and take additional measures to prevent hitting the
// max execution time (if, say, one migration step takes much longer
// than the max execution time)
-set_time_limit(0);
+@set_time_limit(0);
while (!$migrator->finished())
{