aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-10-01 17:43:04 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-10-01 17:43:04 +0000
commit57e842edceed812ab86d382a326615f1f1180d68 (patch)
tree97b22fd976a06b72efa249a071595b451c2a7f02 /phpBB/includes/functions.php
parentfe6021c0a31a24105c135085398b38bce3be2914 (diff)
downloadforums-57e842edceed812ab86d382a326615f1f1180d68.tar
forums-57e842edceed812ab86d382a326615f1f1180d68.tar.gz
forums-57e842edceed812ab86d382a326615f1f1180d68.tar.bz2
forums-57e842edceed812ab86d382a326615f1f1180d68.tar.xz
forums-57e842edceed812ab86d382a326615f1f1180d68.zip
#i112
git-svn-id: file:///svn/phpbb/trunk@8116 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index d4368d5ebf..9aaae9ef5a 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -204,7 +204,7 @@ function still_on_time($extra_time = 15)
if (empty($max_execution_time))
{
- $max_execution_time = (function_exists('ini_get')) ? (int) ini_get('max_execution_time') : (int) get_cfg_var('max_execution_time');
+ $max_execution_time = (function_exists('ini_get')) ? (int) @ini_get('max_execution_time') : (int) @get_cfg_var('max_execution_time');
// If zero, then set to something higher to not let the user catch the ten seconds barrier.
if ($max_execution_time === 0)