tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-08 18:51:12 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1231 from oddnoc/3.1-restfulservice-option-merge-fix

Browse Source 
BUG: Correct semantic error regarding cURL options in RestfulService
This commit is contained in:
Sam Minnée 2013-02-24 17:59:08 -08:00
commit da109a07c1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/RestfulService.php
View File

@ -140,7 +140,7 @@ class RestfulService extends ViewableData {
$method, $method,
$data, $data,
array_merge((array)$this->customHeaders, (array)$headers), array_merge((array)$this->customHeaders, (array)$headers),
array_merge(self::$default_curl_options,$curlOptions), $curlOptions + self::$default_curl_options,
$this->getBasicAuthString() $this->getBasicAuthString()
)); ));
@ -196,7 +196,7 @@ class RestfulService extends ViewableData {
$timeout = 5; $timeout = 5;
$sapphireInfo = new SapphireInfo(); $sapphireInfo = new SapphireInfo();
$useragent = 'SilverStripe/' . $sapphireInfo->Version(); $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_URL, $url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);