diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-06-09 21:27:56 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-06-09 21:27:56 +0200 |
| commit | 9713f52fc6dd2f02800ac845533dba12061f6f29 (patch) | |
| tree | 5f7d8c2e832a3046c04bb295ee31140aa70df2aa /phpBB/includes/startup.php | |
| parent | 37c197404e4a478173b916aa86dd3380a7c96e71 (diff) | |
| parent | d8343f2108e2d84814c9b548b1587313606702f7 (diff) | |
| download | forums-9713f52fc6dd2f02800ac845533dba12061f6f29.tar forums-9713f52fc6dd2f02800ac845533dba12061f6f29.tar.gz forums-9713f52fc6dd2f02800ac845533dba12061f6f29.tar.bz2 forums-9713f52fc6dd2f02800ac845533dba12061f6f29.tar.xz forums-9713f52fc6dd2f02800ac845533dba12061f6f29.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/13923] CS
[ticket/13923] Update startup.php
Diffstat (limited to 'phpBB/includes/startup.php')
| -rw-r--r-- | phpBB/includes/startup.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/startup.php b/phpBB/includes/startup.php index c90fd79366..5900016c39 100644 --- a/phpBB/includes/startup.php +++ b/phpBB/includes/startup.php @@ -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')) |