From 1d2cd827069f1df77a67c4f850c9f476156957f2 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sat, 26 Oct 2013 11:16:07 +0200
Subject: [PATCH] [DDC-2759] Fix regression in ArrayHydrator introduced in
 DDC-1884 at SHA c7b4c9bf0fbc5dca830e0a797cea470510def994

---
 lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php
index 5688d8652..c336e7a5d 100644
--- a/lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php
+++ b/lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php
@@ -190,17 +190,14 @@ class ArrayHydrator extends AbstractHydrator
                         ( ! isset($baseElement[$relationAlias]))
                     ) {
                         $baseElement[$relationAlias] = null;
-                    } else if (
-                        ( ! isset($baseElement[$relationAlias])) ||
-                        ( ! isset($this->_identifierMap[$path][$id[$parent]][$id[$dqlAlias]]))
-                    ) {
+                    } else if ( ! isset($baseElement[$relationAlias])) {
                         $baseElement[$relationAlias] = $data;
                     }
                 }
 
                 $coll =& $baseElement[$relationAlias];
 
-                if ($coll !== null) {
+                if (is_array($coll)) {
                     $this->updateResultPointer($coll, $index, $dqlAlias, $oneToOne);
                 }
             } else {