Cleaning up previous commit.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8088 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2009-03-11 00:22:28 +00:00
parent 4466c9f7b7
commit 80d4dfa306

View file

@ -289,7 +289,6 @@ class BehaviorCollection extends Object {
}
} elseif (isset($this->{$name}->settings) && isset($this->{$name}->settings[$this->modelName])) {
if ($config !== null && $config !== false) {
// if (!empty($config)) {
$config = array_merge($this->{$name}->settings[$this->modelName], $config);
} else {
$config = array();