Permalink
Browse files

Merge branch 'master' into phpcr-77

Conflicts:
	lib/Doctrine/ODM/PHPCR/Mapping/ClassMetadataFactory.php
  • Loading branch information...
2 parents 77845a6 + d89a3ec commit af2f0e3cb854977432ef9f39770757908805d388 dantleech committed Oct 29, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 lib/Doctrine/ODM/PHPCR/Mapping/ClassMetadataFactory.php
@@ -205,6 +205,7 @@ private function addInheritedFields(ClassMetadata $subClass, ClassMetadata $pare
if ($parentClass->referenceable === true && $subClass->referenceable === false) {
throw MappingException::cannotOverrideReferenceableAsFalse($subClass->name);
}
+
$subClass->setReferenceable($parentClass->referenceable);
}

0 comments on commit af2f0e3

Please sign in to comment.