More defensive coding

cakephp · Mar 3, 2014 · c341109 · c341109
1 parent c6f8e5c
commit c341109
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/ORM/Marshaller.php b/src/ORM/Marshaller.php
@@ -355,7 +355,7 @@ protected function _mergeBelongsToMany($original, $assoc, $data, $include) {
 		$extra = [];
 		foreach ($original as $entity) {
 			$joinData = $entity->get('_joinData');
-			if ($joinData) {
+			if ($joinData && $joinData instanceof EntityInterface) {
 				$extra[spl_object_hash($entity)] = $joinData;
 			}
 		}