mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-26 13:18:54 +00:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10812] Disabled register_globals check in PHP 5.4
This commit is contained in:
commit
4df8afd27e
1 changed files with 20 additions and 17 deletions
|
@ -165,6 +165,9 @@ class install_install extends module
|
|||
'S_LEGEND' => false,
|
||||
));
|
||||
|
||||
// Don't check for register_globals on 5.4+
|
||||
if (version_compare($php_version, '5.4.0-dev') < 0)
|
||||
{
|
||||
// Check for register_globals being enabled
|
||||
if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
|
||||
{
|
||||
|
@ -183,7 +186,7 @@ class install_install extends module
|
|||
'S_EXPLAIN' => true,
|
||||
'S_LEGEND' => false,
|
||||
));
|
||||
|
||||
}
|
||||
|
||||
// Check for url_fopen
|
||||
if (@ini_get('allow_url_fopen') == '1' || strtolower(@ini_get('allow_url_fopen')) == 'on')
|
||||
|
|
Loading…
Add table
Reference in a new issue