Merge branch '1.0.x'

malarzm · malarzm · commit 299afae36e71 · 2016-05-30T08:48:35.000+02:00
diff --git a/lib/Doctrine/ODM/MongoDB/Query/ReferencePrimer.php b/lib/Doctrine/ODM/MongoDB/Query/ReferencePrimer.php
@@ -192,7 +192,7 @@ private function parseDotSyntaxForPrimer($fieldName, $class, $documents, $mappin
         }
 
         $mapping = $class->fieldMappings[$e[0]];
-        $e[0] = $mapping['name'];
+        $e[0] = $mapping['fieldName'];
 
         // Case of embedded document(s) to recurse through:
         if ( ! isset($mapping['reference'])) {

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ private function parseDotSyntaxForPrimer($fieldName, $class, $documents, $mappin`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`$mapping = $class->fieldMappings[$e[0]];`
`195`		`- $e[0] = $mapping['name'];`
	`195`	`+ $e[0] = $mapping['fieldName'];`
`196`	`196`
`197`	`197`	`// Case of embedded document(s) to recurse through:`
`198`	`198`	`if ( ! isset($mapping['reference'])) {`