mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-07 20:08:53 +00:00
Merge pull request #6811 from rxu/ticket/17506
[ticket/17506] Ensure superglobal variables are arrays before applying addition - 3.3.x
This commit is contained in:
commit
b3478d83d1
1 changed files with 3 additions and 3 deletions
|
@ -70,12 +70,12 @@ class request implements \phpbb\request\request_interface
|
||||||
|
|
||||||
foreach ($this->super_globals as $const => $super_global)
|
foreach ($this->super_globals as $const => $super_global)
|
||||||
{
|
{
|
||||||
$this->input[$const] = isset($GLOBALS[$super_global]) ? $GLOBALS[$super_global] : array();
|
$this->input[$const] = isset($GLOBALS[$super_global]) ? (array) $GLOBALS[$super_global] : array();
|
||||||
}
|
}
|
||||||
|
|
||||||
// simulate request_order = GP
|
// simulate request_order = GP
|
||||||
$this->original_request = $this->input[\phpbb\request\request_interface::REQUEST];
|
$this->original_request = (array) $this->input[\phpbb\request\request_interface::REQUEST];
|
||||||
$this->input[\phpbb\request\request_interface::REQUEST] = $this->input[\phpbb\request\request_interface::POST] + $this->input[\phpbb\request\request_interface::GET];
|
$this->input[\phpbb\request\request_interface::REQUEST] = (array) $this->input[\phpbb\request\request_interface::POST] + (array) $this->input[\phpbb\request\request_interface::GET];
|
||||||
|
|
||||||
if ($disable_super_globals)
|
if ($disable_super_globals)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue