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

2013-01-30 22:42:40 -06:00
parent df6021a26d 098c6c6295
commit 7e81f9de94
3 changed files with 16 additions and 3 deletions
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -142,7 +142,7 @@ return array(
 		'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',
--- 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',

-)));
+));

 /*
 |--------------------------------------------------------------------------