From 4679a30b3768e06574f40637a51ac91860c93536 Mon Sep 17 00:00:00 2001 From: euromark Date: Tue, 8 Apr 2014 12:22:29 +0200 Subject: [PATCH] move cast up --- lib/Cake/Core/CakePlugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Cake/Core/CakePlugin.php b/lib/Cake/Core/CakePlugin.php index 200a7d2b6..3515de8fa 100644 --- a/lib/Cake/Core/CakePlugin.php +++ b/lib/Cake/Core/CakePlugin.php @@ -121,11 +121,11 @@ class CakePlugin { 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); } }