RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-14 15:16:04 +03:00
Code Issues Projects Releases Wiki Activity

Fixing a bug when calling setDiscriminatorMap from multiple sources (ie: from Events::loadClassMetadata and annotation).

Browse Source
This commit is contained in:
Somfai Mátyás 2012-04-04 14:47:42 +02:00
parent 5b18718b92
commit a2fd4eca37
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View File

@ -2044,7 +2044,7 @@ class ClassMetadataInfo implements ClassMetadata
if ( ! class_exists($className)) { if ( ! class_exists($className)) {
throw MappingException::invalidClassInDiscriminatorMap($className, $this->name); throw MappingException::invalidClassInDiscriminatorMap($className, $this->name);
} }
if (is_subclass_of($className, $this->name)) { if (is_subclass_of($className, $this->name) && ! in_array($className, $this->subClasses)) {
$this->subClasses[] = $className; $this->subClasses[] = $className;
} }
} }