Merge branch '3.1.x'

* 3.1.x:
  [ticket/13923] CS
  [ticket/13923] Update startup.php
This commit is contained in:
Andreas Fischer 2015-06-09 21:27:56 +02:00
commit 9713f52fc6

View file

@ -90,7 +90,11 @@ if (version_compare(PHP_VERSION, '5.4.0-dev', '>='))
}
else
{
@set_magic_quotes_runtime(0);
if (get_magic_quotes_runtime())
{
// Deactivate
@set_magic_quotes_runtime(0);
}
// Be paranoid with passed vars
if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get'))