Kohana v3.3.2

This commit is contained in:
Deon George
2014-09-06 23:43:07 +10:00
parent f96694b18f
commit 8888719653
236 changed files with 1685 additions and 996 deletions

View File

@@ -51,15 +51,15 @@ abstract class Kohana_Controller {
/**
* Executes the given action and calls the [Controller::before] and [Controller::after] methods.
*
*
* Can also be used to catch exceptions from actions in a single place.
*
*
* 1. Before the controller action is called, the [Controller::before] method
* will be called.
* 2. Next the controller action will be called.
* 3. After the controller action is called, the [Controller::after] method
* will be called.
*
*
* @throws HTTP_Exception_404
* @return Response
*/
@@ -105,7 +105,7 @@ abstract class Kohana_Controller {
* Automatically executed after the controller action. Can be used to apply
* transformation to the response, add extra output, and execute
* other custom code.
*
*
* @return void
*/
public function after()
@@ -124,16 +124,16 @@ abstract class Kohana_Controller {
*/
public static function redirect($uri = '', $code = 302)
{
return HTTP::redirect($uri, $code);
return HTTP::redirect( (string) $uri, $code);
}
/**
* Checks the browser cache to see the response needs to be returned,
* execution will halt and a 304 Not Modified will be sent if the
* browser cache is up to date.
*
*
* $this->check_cache(sha1($content));
*
*
* @param string $etag Resource Etag
* @return Response
*/
@@ -142,4 +142,4 @@ abstract class Kohana_Controller {
return HTTP::check_cache($this->request, $this->response, $etag);
}
} // End Controller
}