From 9827ca2cdebaf7dff0cad7fcc4913223e1a7b99a Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 5 Aug 2011 15:23:20 -0500 Subject: [PATCH] More factoring on bootstrap. --- system/laravel.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/system/laravel.php b/system/laravel.php index 4e655d1d..7b30998b 100644 --- a/system/laravel.php +++ b/system/laravel.php @@ -114,11 +114,6 @@ if (count(Config::get('application.packages')) > 0) 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. // -------------------------------------------------------------- @@ -134,6 +129,8 @@ define('ACTIVE_MODULE_PATH', (ACTIVE_MODULE == 'application') ? APP_PATH : MODUL // -------------------------------------------------------------- // 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)) { Routing\Filter::register(require $filters);