RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-30 11:40:15 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
romanb 2007-06-02 20:33:41 +00:00
parent fd70c991c9
commit d7d1bdd97a
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/Doctrine/Hydrate.php
View file

@ -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
} }
} }
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);