Skip to content

D
doctrine-dbal
Commit 8615e8e9 authored by romanb's avatar romanb
Browse files
Options

minor refactoring

parent 6db507c4
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
lib/Doctrine/ORM/Internal/Hydration/StandardHydrator.php
View file @ 8615e8e9
...@@ -266,16 +266,16 @@ class Doctrine_ORM_Internal_Hydration_StandardHydrator extends Doctrine_ORM_Inte ...@@ -266,16 +266,16 @@ class Doctrine_ORM_Internal_Hydration_StandardHydrator extends Doctrine_ORM_Inte
$driver->getElement($data, $entityName)); $driver->getElement($data, $entityName));
} }
} }
if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) { if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) {
if (($coll =& $driver->getReferenceValue($baseElement, $relationAlias)) !== null) { $coll =& $driver->getReferenceValue($baseElement, $relationAlias);
$this->_updateResultPointer($resultPointers, $coll, $index, $dqlAlias, $oneToOne);
}
} else { } else {
if (($coll = $driver->getReferenceValue($baseElement, $relationAlias)) !== null) { $coll = $driver->getReferenceValue($baseElement, $relationAlias);
$this->_updateResultPointer($resultPointers, $coll, $index, $dqlAlias, $oneToOne);
}
} }
if ($coll !== null) {
$this->_updateResultPointer($resultPointers, $coll, $index, $dqlAlias, $oneToOne);
}
} }
// append scalar values to mixed result sets // append scalar values to mixed result sets
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment