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

Pick any none 100 status code before defaulting to 100

This commit is contained in:
Tom Needham 2013-11-13 00:45:49 +00:00
parent dc30056025
commit 17e45e2002
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

@ -170,7 +170,7 @@ class OC_API {
$response = reset($thirdparty['failed']); $response = reset($thirdparty['failed']);
return $response; return $response;
} else { } else {
$responses = array_merge($shipped['succeeded'], $thirdparty['succeeded']); $responses = $thirdparty['succeeded'];
} }
// Merge the successful responses // Merge the successful responses
$meta = array(); $meta = array();
@ -182,8 +182,19 @@ class OC_API {
} else { } else {
$data = array_merge_recursive($data, $response->getData()); $data = array_merge_recursive($data, $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; return $result;
} }