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

More factoring on bootstrap.

This commit is contained in:
Taylor Otwell 2011-08-05 15:23:20 -05:00
parent ebc736812b
commit 9827ca2cde
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
system/laravel.php
View File

@ -114,11 +114,6 @@
Package::load(Config::get('application.packages')); Package::load(Config::get('application.packages'));
} }
// --------------------------------------------------------------
// Register the application filters.
// --------------------------------------------------------------
Routing\Filter::register(require APP_PATH.'filters'.EXT);
// -------------------------------------------------------------- // --------------------------------------------------------------
// Determine the module that should handle the request. // Determine the module that should handle the request.
// -------------------------------------------------------------- // --------------------------------------------------------------
@ -134,6 +129,8 @@
// -------------------------------------------------------------- // --------------------------------------------------------------
// Register the filters for the active module. // Register the filters for the active module.
// -------------------------------------------------------------- // --------------------------------------------------------------
Routing\Filter::register(require APP_PATH.'filters'.EXT);
if (ACTIVE_MODULE !== 'application' and file_exists($filters = ACTIVE_MODULE_PATH.'filters'.EXT)) if (ACTIVE_MODULE !== 'application' and file_exists($filters = ACTIVE_MODULE_PATH.'filters'.EXT))
{ {
Routing\Filter::register(require $filters); Routing\Filter::register(require $filters);