Correcting null array bug

stygiansabyss · stygiansabyss · commit b73c634f02fc · 2014-01-23T12:27:47.000-06:00
diff --git a/src/services/Utility/AliasServiceProvider.php b/src/services/Utility/AliasServiceProvider.php
@@ -71,7 +71,11 @@ public function register()
 		$appAliases = \Config::get('core::nonCoreAliases');
 
 		foreach ($aliases as $alias => $class) {
-			if (!in_array($alias, $appAliases)) {
+			if (!is_null($appAliases)) {
+				if (!in_array($alias, $appAliases)) {
+					\Illuminate\Foundation\AliasLoader::getInstance()->alias($alias, $class);
+				}
+			} else {
 				\Illuminate\Foundation\AliasLoader::getInstance()->alias($alias, $class);
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,11 @@ public function register()`
`71`	`71`	`$appAliases = \Config::get('core::nonCoreAliases');`
`72`	`72`
`73`	`73`	`foreach ($aliases as $alias => $class) {`
`74`		`- if (!in_array($alias, $appAliases)) {`
	`74`	`+ if (!is_null($appAliases)) {`
	`75`	`+ if (!in_array($alias, $appAliases)) {`
	`76`	`+ \Illuminate\Foundation\AliasLoader::getInstance()->alias($alias, $class);`
	`77`	`+ }`
	`78`	`+ } else {`
`75`	`79`	`\Illuminate\Foundation\AliasLoader::getInstance()->alias($alias, $class);`
`76`	`80`	`}`
`77`	`81`	`}`