mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'ocs_api_fix_success_code' into oc_api_tests

This commit is contained in:
tomneedham 2013-11-14 00:41:04 +00:00
parent 00944a376a 17e45e2002
commit b06682b7fb
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/private/api.php
View File

@ -173,7 +173,7 @@ class OC_API {
$response = reset($thirdparty['failed']);
return $response;
} else {
$responses = array_merge($shipped['succeeded'], $thirdparty['succeeded']);
$responses = $thirdparty['succeeded'];
}
// Merge the successful responses
$meta = array();
@ -185,8 +185,19 @@ class OC_API {
} else {
$data = array_merge_recursive($data, $response['response']->getData());
}
$codes[] = $response->getStatusCode();
}
$result = new OC_OCS_Result($data, 100);
// Use any non 100 status codes
$statusCode = 100;
foreach($codes as $code) {
if($code != 100) {
$statusCode = $code;
break;
}
}
$result = new OC_OCS_Result($data, $statusCode);
return $result;
}