move cast up

cakephp · Apr 8, 2014 · 4679a30 · 4679a30
1 parent e948598
commit 4679a30
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/Cake/Core/CakePlugin.php b/lib/Cake/Core/CakePlugin.php
@@ -121,11 +121,11 @@ public static function load($plugin, $config = array()) {
 	public static function loadAll($options = array()) {
 		$plugins = App::objects('plugins');
 		foreach ($plugins as $p) {
-			$opts = isset($options[$p]) ? $options[$p] : array();
+			$opts = isset($options[$p]) ? (array)$options[$p] : array();
 			if (isset($options[0])) {
 				$opts += $options[0];
 			}
-			self::load($p, (array)$opts);
+			self::load($p, $opts);
 		}
 	}