adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-04 10:32:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added afterFind callback to Models where recursive >= 2. Added tests from 'ezyang'. Closes #5103

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7347 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
mark_story 2008-07-20 17:25:39 +00:00
parent c1bac3358a
commit c286736f69
3 changed files with 73 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cake/libs/model/datasources/dbo_source.php
View file

@ -682,7 +682,6 @@ class DboSource extends DataSource {
for ($j = 0; $j < $count2; $j++) {
$className = $classNames[$j];
if ($model->alias != $className && !in_array($className, $filtered)) {
if (!in_array($className, $filtering)) {
$filtering[] = $className;
@ -758,6 +757,7 @@ class DboSource extends DataSource {
}
}
}
$this->__filterResults($fetch, $model);
return $this->__mergeHasMany($resultSet, $fetch, $association, $model, $linkModel, $recursive);
} elseif ($type === 'hasAndBelongsToMany') {
$ins = $fetch = array();
@ -876,7 +876,17 @@ class DboSource extends DataSource {
}
return $this->fetchAll($query, $model->cacheQueries, $model->alias);
}
/**
* mergeHasMany - Merge the results of hasMany relations.
*
*
* @param array $resultSet Data to merge into
* @param array $merge Data to merge
* @param string $association Name of Model being Merged
* @param object $model Model being merged onto
* @param object $linkModel Model being merged
* @return void
**/
function __mergeHasMany(&$resultSet, $merge, $association, &$model, &$linkModel) {
foreach ($resultSet as $i => $value) {
$count = 0;