Commit d7d1bdd9 authored by romanb's avatar romanb

Bugfix for parseData2(). Unrelated to the issues mentioned in my previous commit.

parent fd70c991
...@@ -855,9 +855,9 @@ class Doctrine_Hydrate implements Serializable ...@@ -855,9 +855,9 @@ class Doctrine_Hydrate implements Serializable
$relation = $this->_aliasMap[$cache[$key]['alias']]['relation']; $relation = $this->_aliasMap[$cache[$key]['alias']]['relation'];
// check the type of the relation // check the type of the relation
if ( ! $relation->isOneToOne()) { if ( ! $relation->isOneToOne()) {
if ($prev[$parent][$component] instanceof Doctrine_Record) { /*if ($prev[$parent][$component] instanceof Doctrine_Record) {
throw new Exception(); throw new Exception();
} }*/
$prev[$parent][$component][] = $element; $prev[$parent][$component][] = $element;
$driver->registerCollection($prev[$parent][$component]); $driver->registerCollection($prev[$parent][$component]);
...@@ -894,7 +894,8 @@ class Doctrine_Hydrate implements Serializable ...@@ -894,7 +894,8 @@ class Doctrine_Hydrate implements Serializable
} }
} }
foreach ($currData as $alias => $data) { foreach ($currData as $alias => $data) {
$componentName = $this->_aliasMap[$alias]['table']->getComponentName(); $table = $this->_aliasMap[$alias]['table'];
$componentName = $table->getComponentName();
// component changed // component changed
$identifiable = $driver->isIdentifiable($currData[$alias], $table); $identifiable = $driver->isIdentifiable($currData[$alias], $table);
......
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