Commit 9827ca2c authored by Taylor Otwell's avatar Taylor Otwell

More factoring on bootstrap.

parent ebc73681
...@@ -114,11 +114,6 @@ if (count(Config::get('application.packages')) > 0) ...@@ -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 ...@@ -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);
......
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