Browse Source

More factoring on bootstrap.

Taylor Otwell 13 years ago
parent
commit
9827ca2cde
1 changed files with 2 additions and 5 deletions
  1. 2 5
      system/laravel.php

+ 2 - 5
system/laravel.php

@@ -114,11 +114,6 @@ if (count(Config::get('application.packages')) > 0)
 	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 @@ define('ACTIVE_MODULE_PATH', (ACTIVE_MODULE == 'application') ? APP_PATH : MODUL
 // --------------------------------------------------------------
 // --------------------------------------------------------------
 // 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);