Merge pull request laravel#1875 from effenberger/master

taylorotwell · taylorotwell · commit 92f602edbfa3 · 2013-05-01T09:41:58.000-07:00
modified IoC::registred()
diff --git a/laravel/ioc.php b/laravel/ioc.php
@@ -52,7 +52,7 @@ public static function unregister($name)
 	 */
 	public static function registered($name)
 	{
-		return array_key_exists($name, static::$registry);
+		return array_key_exists($name, static::$registry) || array_key_exists($name, static::$singletons);
 	}
 
 	/**
@@ -246,4 +246,4 @@ protected static function resolveNonClass($parameter)
 		}
 	}
 
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public static function unregister($name)`
`52`	`52`	`*/`
`53`	`53`	`public static function registered($name)`
`54`	`54`	`{`
`55`		`- return array_key_exists($name, static::$registry);`
	`55`	`+ return array_key_exists($name, static::$registry) \|\| array_key_exists($name, static::$singletons);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/**`
`@@ -246,4 +246,4 @@ protected static function resolveNonClass($parameter)`
`246`	`246`	`}`
`247`	`247`	`}`
`248`	`248`
`249`		`-}`
	`249`	`+}`