Permalink
Browse files

Fixing unnecessary extra calls to 'afterFind' callback of 'hasMany' a…

…ssociated models. Closes #995
  • Loading branch information...
1 parent 82fffe6 commit bfaaa6b8ba2422c7b9cec5c67a1ed81a8950388f @ADmad ADmad committed Sep 5, 2010
Showing with 6 additions and 2 deletions.
  1. +6 −2 cake/libs/model/datasources/dbo_source.php
@@ -54,7 +54,7 @@ class DboSource extends DataSource {
/**
* Caches result from query parsing operations. Cached results for both DboSource::name() and
- * DboSource::conditions() will be stored here. Method caching uses `crc32()` which is
+ * DboSource::conditions() will be stored here. Method caching uses `crc32()` which is
* fast but can collisions more easily than other hashing algorithms. If you have problems
* with collisions, set DboSource::$cacheMethods to false.
*
@@ -519,7 +519,7 @@ function cacheMethod($method, $key, $value = null) {
* because the method uses a simple hashing algorithm it can infrequently have collisions.
* Setting DboSource::$cacheMethods to false will disable the memory cache.
*
- * @param mixed $data Either a string with a column to quote. An array of columns to quote or an
+ * @param mixed $data Either a string with a column to quote. An array of columns to quote or an
* object from DboSource::expression() or DboSource::identifier()
* @return string SQL field
* @access public
@@ -845,6 +845,10 @@ function read(&$model, $queryData = array(), $recursive = null) {
$stack = array($assoc);
$db->queryAssociation($model, $linkModel, $type, $assoc, $assocData, $array, true, $resultSet, $model->recursive - 1, $stack);
unset($db);
+
+ if ($type === 'hasMany') {
+ $filtered []= $assoc;
+ }
}
}
}

0 comments on commit bfaaa6b

Please sign in to comment.