From 638032f4c0fa887aabcf494bf2504b54be470a34 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sun, 4 Mar 2012 22:02:11 -0600 Subject: [PATCH 1/2] Fix bug in IoC singleton checking. Signed-off-by: Taylor Otwell --- laravel/ioc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/ioc.php b/laravel/ioc.php index de8e2939..b02280f9 100644 --- a/laravel/ioc.php +++ b/laravel/ioc.php @@ -130,7 +130,7 @@ public static function resolve($name, $parameters = array()) // If the resolver is registering as a singleton resolver, we will cache // the instance of the object in the container so we can resolve it next // time without having to instantiate a brand new instance. - if (isset(static::$registry[$name]['singleton'])) + if (static::$registry[$name]['singleton']) { return static::$singletons[$name] = $object; } From 89dc8903ece9527c9f1b40427dde1238d17a9081 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sun, 4 Mar 2012 22:03:59 -0600 Subject: [PATCH 2/2] Updating version. Signed-off-by: Taylor Otwell --- artisan | 2 +- paths.php | 2 +- public/index.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/artisan b/artisan index 5fd33ef6..ebd9d00b 100644 --- a/artisan +++ b/artisan @@ -3,7 +3,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.0.3 + * @version 3.0.4 * @author Taylor Otwell * @link http://laravel.com */ diff --git a/paths.php b/paths.php index 07bbe15d..042f9a30 100644 --- a/paths.php +++ b/paths.php @@ -3,7 +3,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.0.3 + * @version 3.0.4 * @author Taylor Otwell * @link http://laravel.com */ diff --git a/public/index.php b/public/index.php index 37903a3a..64d5e837 100644 --- a/public/index.php +++ b/public/index.php @@ -3,7 +3,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.0.3 + * @version 3.0.4 * @author Taylor Otwell * @link http://laravel.com */