From d3af0153c1e55b4eef167a1c6a534f42586d7b64 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 21 Mar 2012 16:37:43 -0500 Subject: [PATCH] Fixed order of session loading and auto-loader mappings in app start. --- application/start.php | 64 +++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/application/start.php b/application/start.php index f0fc4912..8420ac56 100644 --- a/application/start.php +++ b/application/start.php @@ -47,6 +47,37 @@ Laravel\Autoloader::$aliases = $aliases; +/* +|-------------------------------------------------------------------------- +| Auto-Loader Mappings +|-------------------------------------------------------------------------- +| +| Registering a mapping couldn't be easier. Just pass an array of class +| to path maps into the "map" function of Autoloader. Then, when you +| want to use that class, just use it. It's simple! +| +*/ + +Autoloader::map(array( + 'Base_Controller' => path('app').'controllers/base.php', +)); + +/* +|-------------------------------------------------------------------------- +| Auto-Loader Directories +|-------------------------------------------------------------------------- +| +| The Laravel auto-loader can search directories for files using the PSR-0 +| naming convention. This convention basically organizes classes by using +| the class namespace to indicate the directory structure. +| +*/ + +Autoloader::directories(array( + path('app').'models', + path('app').'libraries', +)); + /* |-------------------------------------------------------------------------- | Laravel View Loader @@ -110,35 +141,4 @@ if ( ! Request::cli() and Config::get('session.driver') !== '') { Session::load(); -} - -/* -|-------------------------------------------------------------------------- -| Auto-Loader Mappings -|-------------------------------------------------------------------------- -| -| Registering a mapping couldn't be easier. Just pass an array of class -| to path maps into the "map" function of Autoloader. Then, when you -| want to use that class, just use it. It's simple! -| -*/ - -Autoloader::map(array( - 'Base_Controller' => path('app').'controllers/base.php', -)); - -/* -|-------------------------------------------------------------------------- -| Auto-Loader Directories -|-------------------------------------------------------------------------- -| -| The Laravel auto-loader can search directories for files using the PSR-0 -| naming convention. This convention basically organizes classes by using -| the class namespace to indicate the directory structure. -| -*/ - -Autoloader::directories(array( - path('app').'models', - path('app').'libraries', -)); \ No newline at end of file +} \ No newline at end of file