Update from AER.NEW

2014-12-10 11:52:26 +11:00
parent b65ee7b736
commit 6e433c574d
22 changed files with 38 additions and 2164 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 = Arr::merge($options, $this->_options);
+		$options += $this->_options;

 		$uri = $request->uri();

@@ -132,4 +132,4 @@ class Kohana_Request_Client_Curl extends Request_Client_External {
 		return $options;
 	}

-} // End Kohana_Request_Client_Curl
+} // End Kohana_Request_Client_Curl