Fixed more failing tests

cakephp · Apr 3, 2014 · db1a7d5 · db1a7d5
1 parent 55c3eb4
commit db1a7d5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/ORM/ResultSet.php b/src/ORM/ResultSet.php
@@ -310,9 +310,9 @@ protected function _calculateAssociationMap() {
 					'instance' => $meta['instance'],
 					'canBeJoined' => $meta['canBeJoined'],
 					'entityClass' => $meta['instance']->target()->entityClass(),
-					'nestKey' => $meta['aliasPath']
+					'nestKey' => $meta['canBeJoined'] ? $assoc : $meta['aliasPath']
 				];
-				if (!empty($meta['associations'])) {
+				if ($meta['canBeJoined'] && !empty($meta['associations'])) {
 					$visitor($meta['associations']);
 				}
 			}