From 17e45e20021084f84d07d0c7590ebc2645b5d889 Mon Sep 17 00:00:00 2001
From: Tom Needham <tom@tre.tomneedham.com>
Date: Wed, 13 Nov 2013 00:45:49 +0000
Subject: [PATCH] Pick any none 100 status code before defaulting to 100
---
lib/private/api.php | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/lib/private/api.php b/lib/private/api.php
index eac4a825e0..8307f209d2 100644
--- a/lib/private/api.php
+++ b/lib/private/api.php
@@ -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;
}
--
GitLab