From 0f13ffb773a95ddf1a941fb76ba995c01693160d Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Mon, 30 Sep 2013 16:24:47 +0200 Subject: Remove JSON request parsing from Server --- lib/private/appframework/http/request.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'lib/private/appframework') diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php index 3426f0bf752..8c1c2f8ec8c 100644 --- a/lib/private/appframework/http/request.php +++ b/lib/private/appframework/http/request.php @@ -42,14 +42,12 @@ class Request implements \ArrayAccess, \Countable, IRequest { 'env', 'cookies', 'urlParams', - 'params', 'parameters', 'method' ); /** * @param array $vars An associative array with the following optional values: - * @param array 'params' the parsed json array * @param array 'urlParams' the parameters which were matched from the URL * @param array 'get' the $_GET array * @param array|string 'post' the $_POST array or JSON string @@ -74,11 +72,10 @@ class Request implements \ArrayAccess, \Countable, IRequest { if (isset($this->items['post']) && strpos($this->getHeader('Content-Type'), 'application/json') !== false && is_string($this->items['post'])) { - $this->items['post'] = json_decode($this->items['post'], true); + $this->items['params'] = $this->items['post'] = json_decode($this->items['post'], true); } $this->items['parameters'] = array_merge( - $this->items['params'], $this->items['get'], $this->items['post'], $this->items['urlParams'] -- cgit v1.2.3