Permalink
Browse files

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

  • Loading branch information...
1 parent a025cb2 commit 8a6d97dfa76f31cbdadc207eb57087564aa14ceb @lorenzo lorenzo committed Jul 15, 2011
Showing with 8 additions and 4 deletions.
  1. +5 −2 lib/Cake/Core/CakePlugin.php
  2. +3 −2 lib/Cake/Test/Case/Core/CakePluginTest.php
@@ -97,8 +97,11 @@ public static function load($plugin, $config = array()) {
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);
}
}
@@ -216,7 +216,8 @@ public function testLoadAll() {
* @return void
*/
public function testLoadAllWithDefaults() {
- CakePlugin::loadAll(array('bootstrap' => true));
+ $defaults = array('bootstrap' => true);
+ CakePlugin::loadAll(array($defaults));
$expected = array('PluginJs', 'TestPlugin', 'TestPluginTwo');
$this->assertEquals($expected, CakePlugin::loaded());
$this->assertEquals('loaded js plugin bootstrap', Configure::read('CakePluginTest.js_plugin.bootstrap'));
@@ -231,7 +232,7 @@ public function testLoadAllWithDefaults() {
* @return void
*/
public function testLoadAllWithDefaultsAndOverride() {
- CakePlugin::loadAll(array('bootstrap' => true, 'TestPlugin' => array('routes' => true)));
+ CakePlugin::loadAll(array(array('bootstrap' => true), 'TestPlugin' => array('routes' => true)));
CakePlugin::routes();
$expected = array('PluginJs', 'TestPlugin', 'TestPluginTwo');

0 comments on commit 8a6d97d

Please sign in to comment.