This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/classes/Kohana/Request.php b/classes/Kohana/Request.php | |
index 78c17c8..313ea38 100644 | |
--- a/classes/Kohana/Request.php | |
+++ b/classes/Kohana/Request.php | |
@@ -47,13 +47,14 @@ class Kohana_Request implements HTTP_Request { | |
* | |
* @param string $uri URI of the request | |
* @param array $client_params An array of params to pass to the request client | |
+ * @param bool $allow_external Allow external requests? (deprecated in 3.3) | |
* @param array $injected_routes An array of routes to use, for testing |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/classes/Kohana/Request.php b/classes/Kohana/Request.php | |
index 78c17c8..52d043e 100644 | |
--- a/classes/Kohana/Request.php | |
+++ b/classes/Kohana/Request.php | |
@@ -47,13 +47,14 @@ class Kohana_Request implements HTTP_Request { | |
* | |
* @param string $uri URI of the request | |
* @param array $client_params An array of params to pass to the request client | |
+ * @param bool $allow_external Allow external requests? (deprecated in 3.3) | |
* @param array $injected_routes An array of routes to use, for testing |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/classes/Kohana/Request.php b/classes/Kohana/Request.php | |
index 78c17c8..5bee7d8 100644 | |
--- a/classes/Kohana/Request.php | |
+++ b/classes/Kohana/Request.php | |
@@ -47,13 +47,14 @@ class Kohana_Request implements HTTP_Request { | |
* | |
* @param string $uri URI of the request | |
* @param array $client_params An array of params to pass to the request client | |
+ * @param bool $allow_external Allow external requests? (deprecated) | |
* @param array $injected_routes An array of routes to use, for testing |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Kohana/Response.php: if (Request::$initial->secure()) | |
Kohana/URL.php: $protocol = Request::$initial; | |
Kohana/Request/Client/Internal.php: if ($request !== Request::$initial AND Request::$current) | |
Kohana/Request/Client/Internal.php: $initial_request = ($request === Request::$initial); | |
Kohana/Request/Client/External.php: if ($request !== Request::$initial AND Request::$current) | |
Kohana/Request.php: if ( ! Request::$initial) | |
Kohana/Request.php: Request::$initial = $request = new Request($uri, $client_params, $injected_routes); | |
Kohana/Request.php: return Request::$initial; | |
Kohana/Request.php: if (Request::$initial->method() !== HTTP_Request::POST) | |
Kohana/Request.php: if (Request::$initial !== NULL) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit 8e25093633513559e911e9c7d8fc65d93744e6d0 | |
Author: Kiall Mac Innes <[email protected]> | |
Date: Mon Feb 20 14:02:43 2012 +0000 | |
Update database config for PSR-0. Refs #4001. | |
diff --git a/config/database.php b/config/database.php | |
index 694867b..e2021bd 100644 | |
--- a/config/database.php | |
+++ b/config/database.php |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/classes/Kohana/Request.php b/classes/Kohana/Request.php | |
index 7eb5716..9b0d508 100644 | |
--- a/classes/Kohana/Request.php | |
+++ b/classes/Kohana/Request.php | |
@@ -706,7 +706,7 @@ class Kohana_Request implements HTTP_Request { | |
} | |
// Store the controller | |
- $this->_controller = $params['controller']; | |
+ $this->_controller = ucfirst(strtolower($params['controller'])); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/classes/kohana/request.php b/classes/kohana/request.php | |
index 7eb5716..c34393f 100644 | |
--- a/classes/kohana/request.php | |
+++ b/classes/kohana/request.php | |
@@ -45,15 +45,15 @@ class Kohana_Request implements HTTP_Request { | |
* If $cache parameter is set, the response for the request will attempt to | |
* be retrieved from the cache. | |
* | |
- * @param string $uri URI of the request | |
- * @param Cache $cache |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/classes/kohana/request.php b/classes/kohana/request.php | |
index 7eb5716..b146aaa 100644 | |
--- a/classes/kohana/request.php | |
+++ b/classes/kohana/request.php | |
@@ -649,7 +649,7 @@ class Kohana_Request implements HTTP_Request { | |
* @uses Route::all | |
* @uses Route::matches | |
*/ | |
- public function __construct($uri, HTTP_Cache $cache = NULL, $injected_routes = array()) | |
+ public function __construct($uri, array $client_params = array(), $injected_routes = array()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/classes/kohana/request/client.php b/classes/kohana/request/client.php | |
index 9e73b1c..83d12b8 100644 | |
--- a/classes/kohana/request/client.php | |
+++ b/classes/kohana/request/client.php | |
@@ -64,7 +64,41 @@ abstract class Kohana_Request_Client { | |
if ($this->_cache instanceof HTTP_Cache) | |
return $this->_cache->execute($this, $request, $response); | |
- return $this->execute_request($request, $response); | |
+ $response = $this->execute_request($request, $response); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
class Cache { | |
protected $cache = array(); | |
function set($value) | |
{ | |
if (is_object($value)) | |
$this->cache = clone $value; | |
$this->cache = $value; |