diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-10-29 12:37:16 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-10-29 12:37:16 +0200 |
| commit | 319d12bedfecfaa352c4b21cbce471b348ead3bb (patch) | |
| tree | 3d374a070d65b2bcd9129e39f0e28e08a5bb5664 | |
| parent | d0bbb3f7f0780681493284c2f024f17e6f94fa14 (diff) | |
| parent | cd184e49125e70fbce40897ef3e4eec8665de12f (diff) | |
| download | forums-319d12bedfecfaa352c4b21cbce471b348ead3bb.tar forums-319d12bedfecfaa352c4b21cbce471b348ead3bb.tar.gz forums-319d12bedfecfaa352c4b21cbce471b348ead3bb.tar.bz2 forums-319d12bedfecfaa352c4b21cbce471b348ead3bb.tar.xz forums-319d12bedfecfaa352c4b21cbce471b348ead3bb.zip | |
Merge remote-tracking branch 'bantu/ticket/10420' into develop-olympus
* bantu/ticket/10420:
[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 |