Skip to content
Snippets Groups Projects
Commit 17e45e20 authored by Tom Needham's avatar Tom Needham
Browse files

Pick any none 100 status code before defaulting to 100

parent dc300560
No related branches found
No related tags found
No related merge requests found
......@@ -170,7 +170,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();
......@@ -182,8 +182,19 @@ class OC_API {
} else {
$data = array_merge_recursive($data, $response->getData());
}
$codes[] = $response->getStatusCode();
}
// Use any non 100 status codes
$statusCode = 100;
foreach($codes as $code) {
if($code != 100) {
$statusCode = $code;
break;
}
}
$result = new OC_OCS_Result($data, 100);
$result = new OC_OCS_Result($data, $statusCode);
return $result;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment