Merge branch '3.1.x' into 3.2.x

* 3.1.x:
  [ticket/15108] Remove duplicate code in request->context
This commit is contained in:
Tristan Darricau 2017-04-18 23:10:28 +02:00
commit 2b233452c7
No known key found for this signature in database
GPG key ID: 817043C2E29DB881

View file

@ -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;
}
}
/**