Fixing loading of default options in CakePlugin::loadAll(), fixes #1737

This commit is contained in:
Jose Lorenzo Rodriguez 2011-07-15 01:05:53 -04:30
parent a025cb2e01
commit 8a6d97dfa7
2 changed files with 8 additions and 4 deletions

View file

@ -97,8 +97,11 @@ class CakePlugin {
public function loadAll($options = array()) {
$plugins = App::objects('plugins');
foreach ($plugins as $p) {
$opts = isset($options[$p]) ? $options[$p] : $options;
self::load($p, $opts);
$opts = isset($options[$p]) ? $options[$p] : null;
if ($opts === null && isset($options[0])) {
$opts = $options[0];
}
self::load($p, (array) $opts);
}
}