Merge branch 'develop' of github.com:laravel/laravel into develop

taylorotwell · taylorotwell · commit 7e81f9de94d5 · 2013-01-30T22:42:40.000-06:00
diff --git a/app/config/app.php b/app/config/app.php
@@ -142,7 +142,7 @@
 		'Auth'            => 'Illuminate\Support\Facades\Auth',
 		'Blade'           => 'Illuminate\Support\Facades\Blade',
 		'Cache'           => 'Illuminate\Support\Facades\Cache',
-		'ClassLoader'     => 'Illuminate\Foundation\ClassLoader',
+		'ClassLoader'     => 'Illuminate\Support\ClassLoader',
 		'Config'          => 'Illuminate\Support\Facades\Config',
 		'Controller'      => 'Illuminate\Routing\Controllers\Controller',
 		'Cookie'          => 'Illuminate\Support\Facades\Cookie',
diff --git a/app/start/global.php b/app/start/global.php
@@ -11,12 +11,12 @@
 |
 */
 
-ClassLoader::register(new ClassLoader(array(
+ClassLoader::addDirectories(array(
 
 	app_path().'/controllers',
 	app_path().'/models',
 
-)));
+));
 
 /*
 |--------------------------------------------------------------------------
diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
@@ -14,6 +14,19 @@
 
 require __DIR__.'/../vendor/autoload.php';
 
+/*
+|--------------------------------------------------------------------------
+| Register The Laravel Auto Loader
+|--------------------------------------------------------------------------
+|
+| We register an auto-loader "behind" the Composer loader that can load
+| model classes on the fly, even if the autoload files have not been
+| regenerated for the application. We'll add it to the stack here.
+|
+*/
+
+Illuminate\Support\ClassLoader::register();
+
 /*
 |--------------------------------------------------------------------------
 | Register The Workbench Loaders
