diff options
| author | Tom Needham <tom@owncloud.com> | 2013-02-09 12:50:19 +0000 |
|---|---|---|
| committer | Tom Needham <tom@owncloud.com> | 2013-02-09 12:50:19 +0000 |
| commit | 5ad1b63f762ab52f8bf550787588dd1ca728145d (patch) | |
| tree | 19dc892f79f3277a3addda58f15d21e72630bf85 /lib | |
| parent | 5d14a2cc463f09d010537a5537e3339a87d57558 (diff) | |
| download | nextcloud-server-5ad1b63f762ab52f8bf550787588dd1ca728145d.tar.gz nextcloud-server-5ad1b63f762ab52f8bf550787588dd1ca728145d.zip | |
Fix api result merging.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/api.php b/lib/api.php index 3d160734fb7..d50882b1190 100644 --- a/lib/api.php +++ b/lib/api.php @@ -118,7 +118,6 @@ class OC_API { ); } - $response = self::mergeResponses($responses); $formats = array('json', 'xml'); $format = !empty($_GET['format']) && in_array($_GET['format'], $formats) ? $_GET['format'] : 'xml'; @@ -134,7 +133,7 @@ class OC_API { $response = array(); // Sort into shipped and thirdparty $shipped = array( - 'succeded' => array(), + 'succeeded' => array(), 'failed' => array(), ); $thirdparty = array( @@ -143,7 +142,7 @@ class OC_API { ); foreach($responses as $response) { - if(OC_App::isShipped($response['app'])) { + if(OC_App::isShipped($response['app']) || ($response['app'] === 'core')) { if($response['response']->succeeded()) { $shipped['succeeded'][$response['app']] = $response['response']; } else { @@ -250,6 +249,7 @@ class OC_API { */ private static function respond($result, $format='xml') { // Send 401 headers if unauthorised + die(var_dump($result)); if($result->getStatusCode() === self::RESPOND_UNAUTHORISED) { header('WWW-Authenticate: Basic realm="Authorisation Required"'); header('HTTP/1.0 401 Unauthorized'); |