diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-10-29 12:37:32 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-10-29 12:37:32 +0200 |
| commit | 5351195dd7430eb67dfa01ee76d7210f97881ebc (patch) | |
| tree | 450c99c3ea8acb54c0757b874fbf0d4bc4a41bc1 | |
| parent | 27a80d0379a18b7a30346d038ddf6ee9a50718f6 (diff) | |
| parent | 319d12bedfecfaa352c4b21cbce471b348ead3bb (diff) | |
| download | forums-5351195dd7430eb67dfa01ee76d7210f97881ebc.tar forums-5351195dd7430eb67dfa01ee76d7210f97881ebc.tar.gz forums-5351195dd7430eb67dfa01ee76d7210f97881ebc.tar.bz2 forums-5351195dd7430eb67dfa01ee76d7210f97881ebc.tar.xz forums-5351195dd7430eb67dfa01ee76d7210f97881ebc.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10420] Update includes/startup.php for PHP 5.4.
| -rw-r--r-- | phpBB/includes/startup.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/startup.php b/phpBB/includes/startup.php index ca9665da29..bbe2f127f1 100644 --- a/phpBB/includes/startup.php +++ b/phpBB/includes/startup.php @@ -97,8 +97,8 @@ function deregister_globals() unset($input); } -// If we are on PHP >= 6.0.0 we do not need some code -if (version_compare(PHP_VERSION, '6.0.0-dev', '>=')) +// Register globals and magic quotes have been dropped in PHP 5.4 +if (version_compare(PHP_VERSION, '5.4.0-dev', '>=')) { /** * @ignore |