minor refactoring
This commit is contained in:
parent
6db507c465
commit
8615e8e90e
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user