diff options
author | Thomas Tanghus <thomas@tanghus.net> | 2013-09-30 16:24:47 +0200 |
---|---|---|
committer | Thomas Tanghus <thomas@tanghus.net> | 2013-10-01 20:15:04 +0200 |
commit | 0f13ffb773a95ddf1a941fb76ba995c01693160d (patch) | |
tree | 8bc8f979afbedc489d91125dbfed8b3ad9656fa0 /lib/private/appframework | |
parent | 7cd80888455d5292fa74499d55b89f7dd61c9267 (diff) | |
download | nextcloud-server-0f13ffb773a95ddf1a941fb76ba995c01693160d.tar.gz nextcloud-server-0f13ffb773a95ddf1a941fb76ba995c01693160d.zip |
Remove JSON request parsing from Server
Diffstat (limited to 'lib/private/appframework')
-rw-r--r-- | lib/private/appframework/http/request.php | 5 |
1 files changed, 1 insertions, 4 deletions
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'] |