Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes

This commit is contained in:
Taylor Otwell 2012-02-18 13:37:02 -06:00
parent fe0b4b287d
commit 2f66c97806
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
laravel/response.php
View File

@ -205,7 +205,10 @@ public static function download($path, $name = null, $headers = array())
*/ */
public static function prepare($response) public static function prepare($response)
{ {
if ( ! $response instanceof Response) $response = new static($response); if ( ! $response instanceof Response)
{
$response = new static($response);
}
// We'll need to force the response to be a string before closing the session, // We'll need to force the response to be a string before closing the session,
// since the developer may be using the session within a view, and we can't // since the developer may be using the session within a view, and we can't

2
laravel/routing/controller.php
View File

@ -191,7 +191,7 @@ public function execute($method, $parameters = array())
// Again, as was the case with route closures, if the controller "before" // Again, as was the case with route closures, if the controller "before"
// filters return a response, it will be considered the response to the // filters return a response, it will be considered the response to the
// request and the controller method will not be used . // request and the controller method will not be used.
$response = Filter::run($filters, array(), true); $response = Filter::run($filters, array(), true);
if (is_null($response)) if (is_null($response))