From 3789972a35924846ef77bba599500a828731a236 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 21 Feb 2012 09:32:21 -0600 Subject: [PATCH 1/2] fix bug in controller auto-loading. --- laravel/autoloader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/autoloader.php b/laravel/autoloader.php index 89603b72..a3a0db29 100644 --- a/laravel/autoloader.php +++ b/laravel/autoloader.php @@ -130,7 +130,7 @@ protected static function library($class) */ protected static function controller($class) { - $controller = str_replace(array('_', '_Controller'), array('/', ''), $class); + $controller = str_replace(array('_Controller', '_'), array('', '/'), $class); return CONTROLLER_PATH.strtolower($controller).EXT; } From b5f568404a035e082481d644b9e0db94c9a63230 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 21 Feb 2012 09:33:15 -0600 Subject: [PATCH 2/2] increment version. --- changelog.md | 8 ++++++++ public/index.php | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index f4abe742..7b4bbedf 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,13 @@ # Laravel Change Log +## Version 2.1.1 + +- Fix: Fixed bug in controller auto-loading routine. + +### Upgrading from 2.1.0 + +- Replace **laravel** directory. + ## Version 2.1.0 - Fix: Multiple wildcards / regular expressions per segment are now supported. diff --git a/public/index.php b/public/index.php index 9b12abc2..c8a161af 100644 --- a/public/index.php +++ b/public/index.php @@ -3,7 +3,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 2.1.0 + * @version 2.1.1 * @author Taylor Otwell * @link http://laravel.com */