adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-06 19:42:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

removing the condition and adding actsAs to the default list of merged keys.

Browse source
This commit is contained in:
Fitorec 2011-12-06 03:31:54 -06:00
parent afa4dd0dee
commit 22ad6cdca5
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Model/Model.php
View file

@ -675,11 +675,7 @@ class Model extends Object {
}
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);