diff --git a/bundles.php b/bundles.php deleted file mode 100644 index 49d126bb..00000000 --- a/bundles.php +++ /dev/null @@ -1,36 +0,0 @@ - array( -| 'location' => 'admin', -| 'handles' => 'admin', -| ), -| -| Note that the "location" is relative to the "bundles" directory. -| Now the bundle will be recognized by Laravel and will be able -| to respond to requests beginning with "admin"! -| -| Have a bundle that lives in the root of the bundle directory -| and doesn't respond to any requests? Just add the bundle -| name to the array and we'll take care of the rest. -| -*/ - -return array(); \ No newline at end of file diff --git a/laravel/bundle.php b/laravel/bundle.php index 5d4dde5e..db21cead 100644 --- a/laravel/bundle.php +++ b/laravel/bundle.php @@ -40,9 +40,7 @@ class Bundle { */ public static function detect($path) { - $bundles = static::search($path); - - return array_merge($bundles, require path('base').'bundles.php'); + return static::search($path); } /**