From: tomneedham <tom@owncloud.com>
Date: Thu, 14 Nov 2013 01:14:37 +0000 (+0000)
Subject: Return failed shipped responses over succedded shipped responses
X-Git-Tag: v6.0.0beta5~33^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ca5c39a3a1ff624a0bbcb39456c93856b8983b51;p=nextcloud-server.git

Return failed shipped responses over succedded shipped responses
---

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