[Pkg-owncloud-commits] [owncloud] 01/55: Backport fix-5828 manually to stable5. Implements 17e45e2 on stable5

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v5.0.16RC1
in repository owncloud.

commit 8c09d66965db09cda50b2c0fc6b06261965c4678
Author: tomneedham <tom at owncloud.com>
Date:   Mon Feb 17 14:36:42 2014 +0000

    Backport fix-5828 manually to stable5. Implements 17e45e2 on stable5
---
 lib/api.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/api.php b/lib/api.php
index fc76836..307a050 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -165,7 +165,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();
@@ -177,8 +177,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;
 	}
 	

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git