diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-04-18 23:10:28 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-04-18 23:10:28 +0200 |
| commit | 2b233452c7355026cb55a715711506cd3c1985ef (patch) | |
| tree | b63f7880296b400573bbf5a854667413a785c850 | |
| parent | 42fbf9d815756487f5a9dddb6b19264072d65bc8 (diff) | |
| parent | 2d33b6adc69db9deec9f7fc58f92c59f6f8525bd (diff) | |
| download | forums-2b233452c7355026cb55a715711506cd3c1985ef.tar forums-2b233452c7355026cb55a715711506cd3c1985ef.tar.gz forums-2b233452c7355026cb55a715711506cd3c1985ef.tar.bz2 forums-2b233452c7355026cb55a715711506cd3c1985ef.tar.xz forums-2b233452c7355026cb55a715711506cd3c1985ef.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/15108] Remove duplicate code in request->context
| -rw-r--r-- | phpBB/phpbb/request/request.php | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/phpBB/phpbb/request/request.php b/phpBB/phpbb/request/request.php index 92d4213180..00be8fd381 100644 --- a/phpBB/phpbb/request/request.php +++ b/phpBB/phpbb/request/request.php @@ -169,12 +169,6 @@ class request implements \phpbb\request\request_interface $GLOBALS[$this->super_globals[$super_global]][$var_name] = $value; } } - - if (!$this->super_globals_disabled()) - { - unset($GLOBALS[$this->super_globals[$super_global]][$var_name]); - $GLOBALS[$this->super_globals[$super_global]][$var_name] = $value; - } } /** |