diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-08 21:51:47 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-08 21:51:47 +0200 |
| commit | 020bb33150ddaab4463b63799774f144a3448263 (patch) | |
| tree | 3f38d2b1ed25ffa72899a1c4e4c33c3a5d56b12a /lib/private/appframework | |
| parent | 3130438fcc5508ef7b8bd597f90d048e528d6760 (diff) | |
| parent | ebe9bea709dd74e3cab3bbb8e9b1ea141bdf90bf (diff) | |
| download | nextcloud-server-020bb33150ddaab4463b63799774f144a3448263.tar.gz nextcloud-server-020bb33150ddaab4463b63799774f144a3448263.zip | |
Merge pull request #19034 from owncloud/http-request-warning
Prevent warning decoding content
Diffstat (limited to 'lib/private/appframework')
| -rw-r--r-- | lib/private/appframework/http/request.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php index cfd903bffe5..3e24eec37c8 100644 --- a/lib/private/appframework/http/request.php +++ b/lib/private/appframework/http/request.php @@ -410,7 +410,9 @@ class Request implements \ArrayAccess, \Countable, IRequest { } } - $this->items['parameters'] = array_merge($this->items['parameters'], $params); + if (is_array($params)) { + $this->items['parameters'] = array_merge($this->items['parameters'], $params); + } $this->contentDecoded = true; } |