Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

More defensive coding

  • Loading branch information...
commit c3411093d9a36e7fe2ffebd16a195a417ff98eff 1 parent c6f8e5c
@lorenzo lorenzo authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  src/ORM/Marshaller.php
View
2  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;
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.