From cb18209369f2ce0e3e60b405951fff9ca0b93cfc Mon Sep 17 00:00:00 2001 From: Deon George Date: Fri, 16 Dec 2011 20:26:43 +1100 Subject: [PATCH] Upstream Update: Fix for CURLOPTS --- .../kohana/system/classes/kohana/request/client/external.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/kohana/system/classes/kohana/request/client/external.php b/includes/kohana/system/classes/kohana/request/client/external.php index 86fb5ef4..f3e6aeff 100644 --- a/includes/kohana/system/classes/kohana/request/client/external.php +++ b/includes/kohana/system/classes/kohana/request/client/external.php @@ -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 \ No newline at end of file +} // End Kohana_Request_Client_External