diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php index 3fdc303cf..5d52a8091 100644 --- a/lib/Cake/Model/Model.php +++ b/lib/Cake/Model/Model.php @@ -672,10 +672,7 @@ class Model extends Object { } if (is_subclass_of($this, 'AppModel')) { - $merge = array('findMethods'); - if ($this->actsAs !== null || $this->actsAs !== false) { - $merge[] = 'actsAs'; - } + $merge = array('actsAs', 'findMethods'); $parentClass = get_parent_class($this); if ($parentClass !== 'AppModel') { $this->_mergeVars($merge, $parentClass);