Permalink
Browse files

Fixed DDC-1492.

  • Loading branch information...
1 parent 45d95ad commit 77e076f1fdbe24fdb2f5a1fb1842c0b9cb7d95a4 @guilhermeblanco guilhermeblanco committed Nov 15, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
@@ -339,7 +339,7 @@ protected function hydrateRowData(array $row, array &$cache, array &$result)
// Get a reference to the parent object to which the joined element belongs.
if ($this->_rsm->isMixed && isset($this->_rootAliases[$parentAlias])) {
$first = reset($this->_resultPointers);
- $parentObject = $this->_resultPointers[$parentAlias][key($first)];
+ $parentObject = $first[key($first)];
} else if (isset($this->_resultPointers[$parentAlias])) {
$parentObject = $this->_resultPointers[$parentAlias];
} else {

4 comments on commit 77e076f

@guilhermeblanco
Member

@beberlei please merge this one with 2.1. I'm closing the "blocker" ticket.

@Koc
Contributor
Koc commented on 77e076f Nov 15, 2011

Thank you for fast resolving

@Koc
Contributor
Koc commented on 77e076f Nov 18, 2011

@beberlei merge please

@beberlei
Member

Done

Please sign in to comment.