RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-30 12:01:44 +03:00
Code Issues Projects Releases Wiki Activity

[DDC-2759] Fix regression in ArrayHydrator introduced in DDC-1884 at SHA c7b4c9bf0fbc5dca830e0a797cea470510def994

Browse Source
This commit is contained in:
Benjamin Eberlei 2013-10-26 11:16:07 +02:00
parent 7249804e3f
commit 9a3298347c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php
View File

@ -190,17 +190,14 @@ class ArrayHydrator extends AbstractHydrator
( ! isset($baseElement[$relationAlias])) ( ! isset($baseElement[$relationAlias]))
) { ) {
$baseElement[$relationAlias] = null; $baseElement[$relationAlias] = null;
} else if ( } else if ( ! isset($baseElement[$relationAlias])) {
( ! isset($baseElement[$relationAlias])) ||
( ! isset($this->_identifierMap[$path][$id[$parent]][$id[$dqlAlias]]))
) {
$baseElement[$relationAlias] = $data; $baseElement[$relationAlias] = $data;
} }
} }
$coll =& $baseElement[$relationAlias]; $coll =& $baseElement[$relationAlias];
if ($coll !== null) { if (is_array($coll)) {
$this->updateResultPointer($coll, $index, $dqlAlias, $oneToOne); $this->updateResultPointer($coll, $index, $dqlAlias, $oneToOne);
} }
} else { } else {