mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge pull request #1231 from oddnoc/3.1-restfulservice-option-merge-fix
BUG: Correct semantic error regarding cURL options in RestfulService
This commit is contained in:
commit
da109a07c1
@ -140,7 +140,7 @@ class RestfulService extends ViewableData {
|
||||
$method,
|
||||
$data,
|
||||
array_merge((array)$this->customHeaders, (array)$headers),
|
||||
array_merge(self::$default_curl_options,$curlOptions),
|
||||
$curlOptions + self::$default_curl_options,
|
||||
$this->getBasicAuthString()
|
||||
));
|
||||
|
||||
@ -196,7 +196,7 @@ class RestfulService extends ViewableData {
|
||||
$timeout = 5;
|
||||
$sapphireInfo = new SapphireInfo();
|
||||
$useragent = 'SilverStripe/' . $sapphireInfo->Version();
|
||||
$curlOptions = array_merge(self::$default_curl_options, $curlOptions);
|
||||
$curlOptions = $curlOptions + self::$default_curl_options;
|
||||
|
||||
curl_setopt($ch, CURLOPT_URL, $url);
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
|
||||
|
Loading…
Reference in New Issue
Block a user