Fixes to OSB to work with KH 3.3

2012-11-10 10:13:57 +11:00
parent ea36639638
commit 6db02ae77d
238 changed files with 813 additions and 938 deletions
--- a/includes/kohana/system/classes/Kohana/Request/Client/Curl.php
+++ b/includes/kohana/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();

@@ -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