diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-04-20 14:41:20 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-04-20 14:41:20 +0200 |
| commit | 4df8afd27e06c650ad44726d686e66b9bf610e7c (patch) | |
| tree | 6a51dff0d47a3715e4658e076dd076703192ec8e /phpBB/install/install_install.php | |
| parent | 248559d7d10e0d347e139469b5e5a9774e65c11e (diff) | |
| parent | bc0453c93ac516d69abaad73cf2679abb891a0e3 (diff) | |
| download | forums-4df8afd27e06c650ad44726d686e66b9bf610e7c.tar forums-4df8afd27e06c650ad44726d686e66b9bf610e7c.tar.gz forums-4df8afd27e06c650ad44726d686e66b9bf610e7c.tar.bz2 forums-4df8afd27e06c650ad44726d686e66b9bf610e7c.tar.xz forums-4df8afd27e06c650ad44726d686e66b9bf610e7c.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10812] Disabled register_globals check in PHP 5.4
Diffstat (limited to 'phpBB/install/install_install.php')
| -rw-r--r-- | phpBB/install/install_install.php | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index ad84155585..9b27a268f5 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -165,25 +165,28 @@ class install_install extends module 'S_LEGEND' => false, )); - // Check for register_globals being enabled - if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') + // Don't check for register_globals on 5.4+ + if (version_compare($php_version, '5.4.0-dev') < 0) { - $result = '<strong style="color:red">' . $lang['NO'] . '</strong>'; - } - else - { - $result = '<strong style="color:green">' . $lang['YES'] . '</strong>'; - } - - $template->assign_block_vars('checks', array( - 'TITLE' => $lang['PHP_REGISTER_GLOBALS'], - 'TITLE_EXPLAIN' => $lang['PHP_REGISTER_GLOBALS_EXPLAIN'], - 'RESULT' => $result, + // Check for register_globals being enabled + if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') + { + $result = '<strong style="color:red">' . $lang['NO'] . '</strong>'; + } + else + { + $result = '<strong style="color:green">' . $lang['YES'] . '</strong>'; + } - 'S_EXPLAIN' => true, - 'S_LEGEND' => false, - )); + $template->assign_block_vars('checks', array( + 'TITLE' => $lang['PHP_REGISTER_GLOBALS'], + 'TITLE_EXPLAIN' => $lang['PHP_REGISTER_GLOBALS_EXPLAIN'], + 'RESULT' => $result, + 'S_EXPLAIN' => true, + 'S_LEGEND' => false, + )); + } // Check for url_fopen if (@ini_get('allow_url_fopen') == '1' || strtolower(@ini_get('allow_url_fopen')) == 'on') |