Browse Source

Merge remote-tracking branch 'origin/master' into develop

Taylor Otwell 12 years ago
parent
commit
b549e30c7c
4 changed files with 4 additions and 4 deletions
  1. 1 1
      artisan
  2. 1 1
      laravel/ioc.php
  3. 1 1
      paths.php
  4. 1 1
      public/index.php

+ 1 - 1
artisan

@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  * Laravel - A PHP Framework For Web Artisans
  *
  *
  * @package  Laravel
  * @package  Laravel
- * @version  3.0.3
+ * @version  3.0.4
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  * @link     http://laravel.com
  */
  */

+ 1 - 1
laravel/ioc.php

@@ -130,7 +130,7 @@ class IoC {
 		// If the resolver is registering as a singleton resolver, we will cache
 		// 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
 		// the instance of the object in the container so we can resolve it next
 		// time without having to instantiate a brand new instance.
 		// 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;
 			return static::$singletons[$name] = $object;
 		}
 		}

+ 1 - 1
paths.php

@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  * Laravel - A PHP Framework For Web Artisans
  *
  *
  * @package  Laravel
  * @package  Laravel
- * @version  3.0.3
+ * @version  3.0.4
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  * @link     http://laravel.com
  */
  */

+ 1 - 1
public/index.php

@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  * Laravel - A PHP Framework For Web Artisans
  *
  *
  * @package  Laravel
  * @package  Laravel
- * @version  3.0.3
+ * @version  3.0.4
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  * @link     http://laravel.com
  */
  */