summaryrefslogtreecommitdiffstats
path: root/lib/private/api.php
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2014-04-21 15:44:54 +0200
committerLukas Reschke <lukas@statuscode.ch>2014-04-21 15:44:54 +0200
commite88731a477991f54120939724da3c8a455c48b97 (patch)
treeb33e14f6bce285890135bce4bdd3ab8099d6819b /lib/private/api.php
parent4fe5ca1908757781872133c7140f4c8848e94ac6 (diff)
downloadnextcloud-server-e88731a477991f54120939724da3c8a455c48b97.tar.gz
nextcloud-server-e88731a477991f54120939724da3c8a455c48b97.zip
Some more PHPDoc fixes
Diffstat (limited to 'lib/private/api.php')
-rw-r--r--lib/private/api.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/api.php b/lib/private/api.php
index b3b5eb1067b..74887690952 100644
--- a/lib/private/api.php
+++ b/lib/private/api.php
@@ -127,9 +127,9 @@ class OC_API {
/**
* merge the returned result objects into one response
* @param array $responses
+ * @return array|\OC_OCS_Result
*/
public static function mergeResponses($responses) {
- $response = array();
// Sort into shipped and thirdparty
$shipped = array(
'succeeded' => array(),
@@ -191,7 +191,7 @@ class OC_API {
// Merge the successful responses
$data = array();
- foreach($responses as $app => $response) {
+ foreach($responses as $response) {
if($response['shipped']) {
$data = array_merge_recursive($response['response']->getData(), $data);
} else {