diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-06-09 21:27:49 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-06-09 21:27:49 +0200 |
| commit | d8343f2108e2d84814c9b548b1587313606702f7 (patch) | |
| tree | 00012c4469e1f30a9f847228b407fa716a6584c4 /phpBB/includes/startup.php | |
| parent | c952622fa007ecd0d69d479dd3afa6854d2e3599 (diff) | |
| parent | b5573bb92dc0b826a98bd7e092c59d801092704a (diff) | |
| download | forums-d8343f2108e2d84814c9b548b1587313606702f7.tar forums-d8343f2108e2d84814c9b548b1587313606702f7.tar.gz forums-d8343f2108e2d84814c9b548b1587313606702f7.tar.bz2 forums-d8343f2108e2d84814c9b548b1587313606702f7.tar.xz forums-d8343f2108e2d84814c9b548b1587313606702f7.zip | |
Merge pull request #3685 from Nicofuma/ticket/13923
[ticket/13923] Update startup.php
* Nicofuma/ticket/13923:
[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 2885c80541..7353b90d99 100644 --- a/phpBB/includes/startup.php +++ b/phpBB/includes/startup.php @@ -94,7 +94,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')) |