adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-03-12 20:49:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

"Fixes #3772, getting errors using treebehavior and translatebehavior on the same model"

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6268 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-12-27 08:33:29 +00:00
parent c5ff7cb4db
commit ebe356d3b1
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cake/libs/model/behaviors/translate.php
View file

@ -160,7 +160,9 @@ class TranslateBehavior extends ModelBehavior {
}
}
}
$query['fields'] = array_merge($query['fields']);
if (is_array($query['fields'])) {
$query['fields'] = array_merge($query['fields']);
}
$this->runtime[$model->alias]['beforeFind'] = $addFields;
return $query;
}