Leenooks customisations for Kohana

2013-04-22 14:21:45 +10:00
parent edd21b4d5c
commit 7801c70a1b
11 changed files with 101 additions and 331 deletions
--- a/system/classes/Kohana/Request/Client/Curl.php
+++ b/system/classes/Kohana/Request/Client/Curl.php
@@ -64,7 +64,7 @@ class Kohana_Request_Client_Curl extends Request_Client_External {
 		$this->_options[CURLOPT_HEADER]         = FALSE;

 		// Apply any additional options set to
-		$options += $this->_options;
+		$options = Arr::merge($options, $this->_options);

 		$uri = $request->uri();