deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Upstream Update: Fix for CURLOPTS

Browse Source
This commit is contained in:
Deon George 2011-12-16 20:26:43 +11:00
parent 65e62340c9
commit cb18209369
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/kohana/system/classes/kohana/request/client/external.php
View File

@ -293,7 +293,7 @@ class Kohana_Request_Client_External extends Request_Client {
$options[CURLOPT_RETURNTRANSFER] = TRUE;
// Apply any additional options set to Request_Client_External::$_options
$options += $this->_options;
$options = Arr::merge($options, $this->_options);
$uri = $request->uri();
@ -424,4 +424,4 @@ class Kohana_Request_Client_External extends Request_Client {
return $response;
}
} // End Kohana_Request_Client_External
} // End Kohana_Request_Client_External