fixes #420
This commit is contained in:
parent
46154c5682
commit
635f1a9c8f
1 changed files with 4 additions and 4 deletions
|
@ -837,14 +837,14 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
|
||||||
$lower = strtolower($name);
|
$lower = strtolower($name);
|
||||||
|
|
||||||
$lower = $this->_table->getColumnName($lower);
|
$lower = $this->_table->getColumnName($lower);
|
||||||
|
|
||||||
$type = $this->_table->getTypeOf($name);
|
|
||||||
|
|
||||||
if (isset($this->_data[$lower])) {
|
if (isset($this->_data[$lower])) {
|
||||||
if ($value instanceof Doctrine_Record && $type != 'object') {
|
if ($value instanceof Doctrine_Record) {
|
||||||
|
$type = $this->_table->getTypeOf($name);
|
||||||
|
|
||||||
$id = $value->getIncremented();
|
$id = $value->getIncremented();
|
||||||
|
|
||||||
if ($id !== null) {
|
if ($id !== null && $type !== 'object') {
|
||||||
$value = $id;
|
$value = $id;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue