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

fix bundle dependency error possibility. fix WSOD in view rendering.

This commit is contained in:
Taylor Otwell 2012-01-24 08:58:21 -06:00
parent 67696d8114
commit 27502918fb
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
laravel/bundle.php
View File

@ -46,7 +46,7 @@ public static function start($bundle)
// dependent bundles so that they are available.
if (file_exists($path = static::path($bundle).'bundle'.EXT))
{
require $path;
require_once $path;
}
// Each bundle may also have a "routes" file which is responsible for
@ -65,11 +65,9 @@ public static function start($bundle)
*/
public static function routes($bundle)
{
if (static::started($bundle)) return;
if (file_exists($path = static::path($bundle).'routes'.EXT))
{
require $path;
require_once $path;
}
}

11
laravel/response.php
View File

@ -214,7 +214,16 @@ public static function prepare($response)
// Since this method is used by both the Route and Controller classes, it is
// a convenient spot to cast the application response to a string before it
// is returned to the main request handler.
$response->content = (string) $response->content;
$content =& $response->content;
if (is_object($content) and method_exists($content, '__toString'))
{
$content = $content->__toString();
}
else
{
$content = (string) $content;
}
return $response;
}