From 6afcac84d07ac076d4d9eb382a819877551c65d9 Mon Sep 17 00:00:00 2001 From: vvh-empora Date: Tue, 3 Mar 2015 11:40:19 +0100 Subject: [PATCH] embeddedClasses support... ...for JoinedSubclassPersister.php --- lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php b/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php index d4159ce47..2886413fd 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php @@ -546,7 +546,8 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister if (isset($this->class->fieldMappings[$name]['inherited']) && ! isset($this->class->fieldMappings[$name]['id']) || isset($this->class->associationMappings[$name]['inherited']) - || ($this->class->isVersioned && $this->class->versionField == $name)) { + || ($this->class->isVersioned && $this->class->versionField == $name) + || isset($this->class->embeddedClasses[$name])) { continue; }