Browse files

removing the condition and adding actsAs to the default list of merge…

…d keys.
  • Loading branch information...
1 parent afa4dd0 commit 22ad6cdca503a6bbd68851acb0458bb7ab3388f0 @fitorec fitorec committed Dec 6, 2011
Showing with 1 addition and 5 deletions.
  1. +1 −5 lib/Cake/Model/Model.php
View
6 lib/Cake/Model/Model.php
@@ -675,11 +675,7 @@ public function __construct($id = false, $table = null, $ds = null) {
}
if (is_subclass_of($this, 'AppModel')) {
- $merge = array('findMethods');
- #if (!empty($this->actsAs)) { //Another possible solution
- 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);

0 comments on commit 22ad6cd

Please sign in to comment.