Skip to content

D
doctrine-dbal
Commit 33fbb4f3 authored by pookey's avatar pookey
Browse files
Options

previous fix resulted in php segfaulting

parent 9f00ce65
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
lib/Doctrine/Hydrate.php
View file @ 33fbb4f3
...@@ -395,8 +395,7 @@ abstract class Doctrine_Hydrate extends Doctrine_Access { ...@@ -395,8 +395,7 @@ abstract class Doctrine_Hydrate extends Doctrine_Access {
$prev = $this->initRelated($prev, $name); $prev = $this->initRelated($prev, $name);
// aggregate values have numeric keys // aggregate values have numeric keys
if(isset($row[0])) {
//if(isset($row[0])) {
$path = array_search($name, $this->tableAliases); $path = array_search($name, $this->tableAliases);
$alias = $this->getPathAlias($path); $alias = $this->getPathAlias($path);
...@@ -410,7 +409,7 @@ abstract class Doctrine_Hydrate extends Doctrine_Access { ...@@ -410,7 +409,7 @@ abstract class Doctrine_Hydrate extends Doctrine_Access {
$prev[$name]->setAggregateValue($agg, $value); $prev[$name]->setAggregateValue($agg, $value);
} }
//} }
continue; continue;
} }
......
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