diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-04-20 14:39:16 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-04-20 14:39:16 +0200 |
| commit | bc0453c93ac516d69abaad73cf2679abb891a0e3 (patch) | |
| tree | b1f21633f6585f6c1feb184d117ba3d88a646b88 | |
| parent | 6e77ca7c99db54eb9d8ee403ce98c3471919a0a0 (diff) | |
| parent | edf60bcd550334a521f35700d52d800b1851d693 (diff) | |
| download | forums-bc0453c93ac516d69abaad73cf2679abb891a0e3.tar forums-bc0453c93ac516d69abaad73cf2679abb891a0e3.tar.gz forums-bc0453c93ac516d69abaad73cf2679abb891a0e3.tar.bz2 forums-bc0453c93ac516d69abaad73cf2679abb891a0e3.tar.xz forums-bc0453c93ac516d69abaad73cf2679abb891a0e3.zip | |
Merge remote-tracking branch 'galaxyAbstractor/ticket/10812' into develop-olympus
* galaxyAbstractor/ticket/10812:
[ticket/10812] Disabled register_globals check in PHP 5.4
| -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 026fc0d404..454c8b4df0 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -166,25 +166,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') |