Browse Source

Fixed order of session loading and auto-loader mappings in app start.

Taylor Otwell 12 years ago
parent
commit
d3af0153c1
1 changed files with 32 additions and 32 deletions
  1. 32 32
      application/start.php

+ 32 - 32
application/start.php

@@ -47,6 +47,37 @@ $aliases = Laravel\Config::get('application.aliases');
 
 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 @@ date_default_timezone_set(Config::get('application.timezone'));
 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',
-));
+}