aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/startup.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-10-18 21:16:42 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-10-18 21:16:42 +0200
commitcd184e49125e70fbce40897ef3e4eec8665de12f (patch)
tree1f8e98ab48c2d460493ffa9f4803e45844efe4b0 /phpBB/includes/startup.php
parentcfb51358058e30e4303c1fdc10920c98a568871d (diff)
downloadforums-cd184e49125e70fbce40897ef3e4eec8665de12f.tar
forums-cd184e49125e70fbce40897ef3e4eec8665de12f.tar.gz
forums-cd184e49125e70fbce40897ef3e4eec8665de12f.tar.bz2
forums-cd184e49125e70fbce40897ef3e4eec8665de12f.tar.xz
forums-cd184e49125e70fbce40897ef3e4eec8665de12f.zip
[ticket/10420] Update includes/startup.php for PHP 5.4.
PHP 5.4 dropped support for register globals and magic quotes. Calling set_magic_quotes_runtime() on PHP 5.4 actually results in an E_CORE_ERROR error. PHPBB3-10420
Diffstat (limited to 'phpBB/includes/startup.php')
-rw-r--r--phpBB/includes/startup.php4
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