diff --git a/application/filters.php b/application/filters.php index 41ac6010..dd4917a3 100644 --- a/application/filters.php +++ b/application/filters.php @@ -50,7 +50,7 @@ 'after' => function($response) { - // Do stuff after every request to your application. + Input::flash(); }, diff --git a/laravel/laravel.php b/laravel/laravel.php index 65622ea0..4eb02b2b 100644 --- a/laravel/laravel.php +++ b/laravel/laravel.php @@ -213,14 +213,6 @@ $response = Response::error('404'); } -/** - * Stringify the response. We need to force the response to be - * stringed before closing the session, since the developer may - * be using the session within their views, so we cannot age - * the session data until the view is rendered. - */ -$response->content = $response->render(); - /** * Close the session and write the active payload to persistent * storage. The session cookie will also be written and if the @@ -229,8 +221,6 @@ */ if (Config::$items['session']['driver'] !== '') { - Input::flash(); - IoC::core('session')->save($driver); } diff --git a/laravel/routing/controller.php b/laravel/routing/controller.php index 2392635b..b028c61f 100644 --- a/laravel/routing/controller.php +++ b/laravel/routing/controller.php @@ -136,14 +136,17 @@ public function execute($method, $parameters = array()) } } - // The after filter and the framework expects all responses to - // be instances of the Response class. If the method did not - // return an instsance of Response, we will make on now. if ( ! $response instanceof Response) { $response = new Response($response); } + // Stringify the response. We need to force the response to be + // stringed before closing the session, since the developer may + // be using the session within their views, so we cannot age + // the session data until the view is rendered. + $response->content = $response->render(); + Filter::run($this->filters('after', $method), array($response)); return $response; diff --git a/laravel/routing/route.php b/laravel/routing/route.php index 39f42902..7f3292f8 100644 --- a/laravel/routing/route.php +++ b/laravel/routing/route.php @@ -111,14 +111,17 @@ public function call() } } - // The after filter and the framework expects all responses to - // be instances of the Response class. If the route did not - // return an instsance of Response, we will make on now. if ( ! $response instanceof Response) { $response = new Response($response); } + // Stringify the response. We need to force the response to be + // stringed before closing the session, since the developer may + // be using the session within their views, so we cannot age + // the session data until the view is rendered. + $response->content = $response->render(); + $filters = array_merge($this->filters('after'), array('after')); Filter::run($filters, array($response));