Merge remote-tracking branch 'bantu/ticket/10420' into develop-olympus

* bantu/ticket/10420:
  [ticket/10420] Update includes/startup.php for PHP 5.4.
This commit is contained in:
Igor Wiedler 2011-10-29 12:37:16 +02:00
commit 319d12bedf

View file

@ -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