Prevent warning decoding content

10 years ago · 31a8949adf
parent fb9e75edb6
commit 31a8949adf
1 changed files with 3 additions and 1 deletions
--- 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;
 	}