RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 14:56:01 +03:00
Code Issues Projects Releases Wiki Activity

Merged r3134:3135 (fixes #582)

Browse Source
This commit is contained in:
Jonathan.Wage 2007-11-10 22:00:21 +00:00
parent e53a659c6e
commit b889f427c3
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Doctrine/Data/Import.php
View File

@ -121,6 +121,9 @@ class Doctrine_Data_Import extends Doctrine_Data
foreach ($row as $key => $value) {
if ($obj->getTable()->hasColumn($key)) {
$obj->set($key, $value);
} else if (method_exists($obj, 'set' . Doctrine::classify($key))) {
$func = 'set' . Doctrine::classify($key);
$obj->$func($value);
} else if ($obj->getTable()->hasRelation($key)) {
if (is_array($value)) {
if (isset($value[0])) {
@ -232,11 +235,6 @@ class Doctrine_Data_Import extends Doctrine_Data
$record = $this->_importedObjects[$rowKey];
if( is_array($nestedSet) AND !empty($nestedSet) )
{
$this->_processRow($rowKey, $nestedSet);
}
if( !$parent )
{
$manager->getTable($model)->getTree()->createRoot($record);