Commit 10b9001e authored by Taylor Otwell's avatar Taylor Otwell

adjust how the response is rendered, as well as move input flashing to after filter.

parent 7a963197
...@@ -50,7 +50,7 @@ return array( ...@@ -50,7 +50,7 @@ return array(
'after' => function($response) 'after' => function($response)
{ {
// Do stuff after every request to your application. Input::flash();
}, },
......
...@@ -213,14 +213,6 @@ else ...@@ -213,14 +213,6 @@ else
$response = Response::error('404'); $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 * Close the session and write the active payload to persistent
* storage. The session cookie will also be written and if the * storage. The session cookie will also be written and if the
...@@ -229,8 +221,6 @@ $response->content = $response->render(); ...@@ -229,8 +221,6 @@ $response->content = $response->render();
*/ */
if (Config::$items['session']['driver'] !== '') if (Config::$items['session']['driver'] !== '')
{ {
Input::flash();
IoC::core('session')->save($driver); IoC::core('session')->save($driver);
} }
......
...@@ -136,14 +136,17 @@ abstract class Controller { ...@@ -136,14 +136,17 @@ abstract class Controller {
} }
} }
// 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) if ( ! $response instanceof Response)
{ {
$response = new Response($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)); Filter::run($this->filters('after', $method), array($response));
return $response; return $response;
......
...@@ -111,14 +111,17 @@ class Route { ...@@ -111,14 +111,17 @@ class Route {
} }
} }
// 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) if ( ! $response instanceof Response)
{ {
$response = new Response($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')); $filters = array_merge($this->filters('after'), array('after'));
Filter::run($filters, array($response)); Filter::run($filters, array($response));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment