|
|
|
@ -147,6 +147,7 @@ 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']); |
|
|
|
@ -157,14 +158,17 @@ class OC_API { |
|
|
|
|
// Maybe any that are not OC_API::RESPOND_SERVER_ERROR |
|
|
|
|
$response = reset($shipped['failed']); |
|
|
|
|
return $response; |
|
|
|
|
} else { |
|
|
|
|
} elseif(!empty($thirdparty['failed'])) { |
|
|
|
|
// Return the third party failure result |
|
|
|
|
$response = reset($thirdparty['failed']); |
|
|
|
|
return $response; |
|
|
|
|
} else { |
|
|
|
|
$responses = array_merge($shipped['succeeded'], $thirdparty['succeeded']); |
|
|
|
|
} |
|
|
|
|
// Merge the successful responses |
|
|
|
|
$meta = array(); |
|
|
|
|
$data = array(); |
|
|
|
|
|
|
|
|
|
foreach($responses as $app => $response) { |
|
|
|
|
if(OC_App::isShipped($app)) { |
|
|
|
|
$data = array_merge_recursive($response->getData(), $data); |
|
|
|
|