Fixed duplication of Model's afterFind callback in HABTM relation and…

… content of array passed to that callback [ticket 3970]
cakephp · Aug 9, 2013 · c033df3 · c033df3
1 parent 49d66af
commit c033df3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 82 deletions.
diff --git a/app/Config/database.php.default b/app/Config/database.php.default
diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php
@@ -1112,7 +1112,7 @@ public function read(Model $model, $queryData = array(), $recursive = null) {
 						$db->queryAssociation($model, $linkModel, $type, $assoc, $assocData, $array, true, $resultSet, $model->recursive - 1, $stack);
 						unset($db);
 
-						if ($type === 'hasMany') {
+						if ($type === 'hasMany' || $type === 'hasAndBelongsToMany') {
 							$filtered[] = $assoc;
 						}
 					}
@@ -1138,7 +1138,10 @@ public function read(Model $model, $queryData = array(), $recursive = null) {
  * @return array Array of results that have been filtered through $model->afterFind
  */
 	protected function _filterResults(&$results, Model $model, $filtered = array()) {
-		$current = reset($results);
+		if (!is_array($results)) {
+                        return array();
+                }
+                $current = reset($results);
 		if (!is_array($current)) {
 			return array();
 		}
@@ -1252,6 +1255,9 @@ public function queryAssociation(Model $model, &$linkModel, $type, $association,
 				} else {
 					$fetch = null;
 				}
+                                if ($queryData['callbacks'] === true || $queryData['callbacks'] === 'after') {
+					$this->_filterResults($fetch, $model);
+				}
 			}
 
 			$modelAlias = $model->alias;
@@ -1312,7 +1318,7 @@ public function queryAssociation(Model $model, &$linkModel, $type, $association,
 					} else {
 						$this->_mergeAssociation($row, $fetch, $association, $type, $selfJoin);
 					}
-					if (isset($row[$association])) {
+					if (isset($row[$association]) && $type !== 'hasAndBelongsToMany') {
 						$row[$association] = $linkModel->afterFind($row[$association], false);
 					}
 				} else {