diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-10-01 17:43:04 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-10-01 17:43:04 +0000 |
| commit | 57e842edceed812ab86d382a326615f1f1180d68 (patch) | |
| tree | 97b22fd976a06b72efa249a071595b451c2a7f02 | |
| parent | fe6021c0a31a24105c135085398b38bce3be2914 (diff) | |
| download | forums-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
| -rw-r--r-- | phpBB/common.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rwxr-xr-x | phpBB/install/install_install.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 34f8071a83..7b3a57c7d8 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -88,7 +88,7 @@ else set_magic_quotes_runtime(0); // Be paranoid with passed vars - if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') + if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get')) { deregister_globals(); } 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) diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 593f98d7bb..0d8e9d1c3b 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -278,7 +278,7 @@ class install_install extends module foreach ($checks as $mb_checks) { - $ini_val = ini_get('mbstring.' . $mb_checks[0]); + $ini_val = @ini_get('mbstring.' . $mb_checks[0]); switch ($mb_checks[1]) { case '&': |