wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return failed shipped responses over succedded shipped responses

Browse source
This commit is contained in:
tomneedham 2013-11-14 01:14:37 +00:00
parent 5a2d700866
commit ca5c39a3a1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/private/api.php
View file

@ -159,15 +159,15 @@ class OC_API {
} }
// Remove any error responses if there is one shipped response that succeeded // Remove any error responses if there is one shipped response that succeeded
if(!empty($shipped['succeeded'])) { if(!empty($shipped['failed'])) {
$responses = array_merge($shipped['succeeded'], $thirdparty['succeeded']);
} else if(!empty($shipped['failed'])) {
// Which shipped response do we use if they all failed? // Which shipped response do we use if they all failed?
// They may have failed for different reasons (different status codes) // They may have failed for different reasons (different status codes)
// Which reponse code should we return? // Which reponse code should we return?
// Maybe any that are not OC_API::RESPOND_SERVER_ERROR // Maybe any that are not OC_API::RESPOND_SERVER_ERROR
$response = reset($shipped['failed']); $response = reset($shipped['failed']);
return $response['response']; return $response['response'];
} elseif(!empty($shipped['succeeded'])) {
$responses = array_merge($shipped['succeeded'], $thirdparty['succeeded']);
} elseif(!empty($thirdparty['failed'])) { } elseif(!empty($thirdparty['failed'])) {
// Return the third party failure result // Return the third party failure result
$response = reset($thirdparty['failed']); $response = reset($thirdparty['failed']);