diff options
| author | Robin McCorkell <rmccorkell@owncloud.com> | 2015-09-14 22:36:40 +0100 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@owncloud.com> | 2015-09-14 22:36:40 +0100 |
| commit | 31a8949adf2cd0daae07fda74960e130bd23ef03 (patch) | |
| tree | 850dff0012326d364f441e1bc253edd95ebfdce7 /lib | |
| parent | fb9e75edb6d01729a27c84f6f11399a1b0fde9f3 (diff) | |
| download | nextcloud-server-31a8949adf2cd0daae07fda74960e130bd23ef03.tar.gz nextcloud-server-31a8949adf2cd0daae07fda74960e130bd23ef03.zip | |
Prevent warning decoding content
Diffstat (limited to 'lib')
| -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 b430673f9a9..e58c435d9a0 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; } |