mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
#i112
git-svn-id: file:///svn/phpbb/trunk@8116 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
fe6021c0a3
commit
57e842edce
3 changed files with 3 additions and 3 deletions
|
@ -88,7 +88,7 @@ else
|
||||||
set_magic_quotes_runtime(0);
|
set_magic_quotes_runtime(0);
|
||||||
|
|
||||||
// Be paranoid with passed vars
|
// 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();
|
deregister_globals();
|
||||||
}
|
}
|
||||||
|
|
|
@ -204,7 +204,7 @@ function still_on_time($extra_time = 15)
|
||||||
|
|
||||||
if (empty($max_execution_time))
|
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 zero, then set to something higher to not let the user catch the ten seconds barrier.
|
||||||
if ($max_execution_time === 0)
|
if ($max_execution_time === 0)
|
||||||
|
|
|
@ -278,7 +278,7 @@ class install_install extends module
|
||||||
|
|
||||||
foreach ($checks as $mb_checks)
|
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])
|
switch ($mb_checks[1])
|
||||||
{
|
{
|
||||||
case '&':
|
case '&':
|
||||||
|
|
Loading…
Add table
Reference in a new issue