From c44b6264dd12e5e0835384748ad66e8661939924 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sun, 29 Jan 2012 17:33:58 -0600 Subject: [PATCH] fix autoloading system path issue. --- laravel/autoloader.php | 5 ----- laravel/core.php | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/laravel/autoloader.php b/laravel/autoloader.php index 91d1ea1b..e9975551 100644 --- a/laravel/autoloader.php +++ b/laravel/autoloader.php @@ -60,11 +60,6 @@ class_alias(static::$aliases[$class], $class); { $namespace = substr($class, 0, $slash); - if ($namespace == 'Laravel') - { - return static::load_psr($class, path('base')); - } - // If the class namespace is mapped to a directory, we will load the class // using the PSR-0 standards from that directory; however, we will trim // off the beginning of the namespace to account for files in the root diff --git a/laravel/core.php b/laravel/core.php index bda8f8d0..c4ecde04 100644 --- a/laravel/core.php +++ b/laravel/core.php @@ -37,6 +37,13 @@ */ Autoloader::$aliases = Config::get('application.aliases'); +/** + * Register the Laravel namespace so that the auto-loader loads it + * according to the PSR-0 naming conventions. This should provide + * fast resolution of all core classes. + */ +Autoloader::namespaces(array('Laravel' => path('sys'))); + /** * Register all of the bundles that are defined in the bundle info * file within the bundles directory. This informs the framework