diff --git a/lib/Cleantalk/ApbctWP/HTTP/HTTPMultiRequestService.php b/lib/Cleantalk/ApbctWP/HTTP/HTTPMultiRequestService.php index 25ffdffaa..997bdd638 100644 --- a/lib/Cleantalk/ApbctWP/HTTP/HTTPMultiRequestService.php +++ b/lib/Cleantalk/ApbctWP/HTTP/HTTPMultiRequestService.php @@ -131,18 +131,18 @@ public function executeMultiContract() */ public function fillMultiContract($http_multi_result) { - // Handle HTTP request error - if (!empty($http_multi_result['error'])) { - $this->error_msg = __CLASS__ . ': HTTP_MULTI_RESULT ERROR' . $http_multi_result['error']; - return $this; - } - // Validate result is an array if (!is_array($http_multi_result)) { $this->error_msg = __CLASS__ . ': HTTP_MULTI_RESULT INVALID'; return $this; } + // Handle HTTP request error + if (!empty($http_multi_result['error'])) { + $this->error_msg = __CLASS__ . ': HTTP_MULTI_RESULT ERROR: ' . $http_multi_result['error']; + return $this; + } + // Fill each contract with corresponding response data foreach ($this->contracts as $contract) { if (isset($http_multi_result[$contract->url])) { diff --git a/lib/Cleantalk/Common/HTTP/Request.php b/lib/Cleantalk/Common/HTTP/Request.php index b7e7db7c9..ee16ab029 100644 --- a/lib/Cleantalk/Common/HTTP/Request.php +++ b/lib/Cleantalk/Common/HTTP/Request.php @@ -366,8 +366,8 @@ protected function runCallbacks() } unset($response); - // Return a single content if it was a single request - return is_array($this->response) && count($this->response) > 1 + // Return associative array if URLs were passed as array, single value otherwise + return is_array($this->url) ? $return_value : reset($return_value); }