adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix illegal offset caused by TranslateBehavior.

Browse source 
If you load TranslateBehavior at runtime in a disabled state, the enabled
flag would be interpreted as an association and cause errors.

Fixes #2443
This commit is contained in:
mark_story 2012-01-07 11:58:35 -05:00
parent 87924414fc
commit beced84d2d
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Model/BehaviorCollection.php
View file

@ -106,6 +106,9 @@ class BehaviorCollection extends ObjectCollection {
$alias = $behavior; $alias = $behavior;
$behavior = $config['className']; $behavior = $config['className'];
} }
$configDisabled = isset($config['enabled']) && $config['enabled'] === false;
unset($config['enabled'], $config['className']);
list($plugin, $name) = pluginSplit($behavior, true); list($plugin, $name) = pluginSplit($behavior, true);
if (!isset($alias)) { if (!isset($alias)) {
$alias = $name; $alias = $name;
@ -165,7 +168,6 @@ class BehaviorCollection extends ObjectCollection {
} }
} }
$configDisabled = isset($config['enabled']) && $config['enabled'] === false;
if (!in_array($alias, $this->_enabled) && !$configDisabled) { if (!in_array($alias, $this->_enabled) && !$configDisabled) {
$this->enable($alias); $this->enable($alias);
} elseif ($configDisabled) { } elseif ($configDisabled) {

15
lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
View file

@ -419,9 +419,22 @@ class BehaviorCollectionTest extends CakeTestCase {
*/ */
public $fixtures = array( public $fixtures = array(
'core.apple', 'core.sample', 'core.article', 'core.user', 'core.comment', 'core.apple', 'core.sample', 'core.article', 'core.user', 'core.comment',
'core.attachment', 'core.tag', 'core.articles_tag' 'core.attachment', 'core.tag', 'core.articles_tag', 'core.translate'
); );
/**
* Test load() with enabled => false
*
*/
public function testLoadDisabled() {
$Apple = new Apple();
$this->assertSame($Apple->Behaviors->attached(), array());
$Apple->Behaviors->load('Translate', array('enabled' => false));
$this->assertTrue($Apple->Behaviors->attached('Translate'));
$this->assertFalse($Apple->Behaviors->enabled('Translate'));
}
/** /**
* Tests loading aliased behaviors * Tests loading aliased behaviors
*/ */