RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-20 07:21:40 +03:00
Code Issues Projects Releases Wiki Activity

fixed reference setting

Browse Source
This commit is contained in:
zYne 2007-05-23 20:33:47 +00:00
parent 796c53fc87
commit 01d8e55bd0
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Doctrine/Collection.php
View File

@ -232,7 +232,7 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
$value = $record->get($relation->getLocal()); $value = $record->get($relation->getLocal());
foreach ($this->getNormalIterator() as $record) { foreach ($this->data as $record) {
if ($value !== null) { if ($value !== null) {
$record->set($this->referenceField, $value, false); $record->set($this->referenceField, $value, false);
} else { } else {
@ -300,8 +300,14 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
$record = $this->_table->create(); $record = $this->_table->create();
if (isset($this->referenceField)) { if (isset($this->referenceField)) {
$value = $this->reference->get($this->relation->getLocal());
if ($value !== null) {
$record->set($this->referenceField, $value, false);
} else {
$record->set($this->referenceField, $this->reference, false); $record->set($this->referenceField, $this->reference, false);
} }
}
$this->data[] = $record; $this->data[] = $record;
@ -370,8 +376,14 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
public function add(Doctrine_Record $record, $key = null) public function add(Doctrine_Record $record, $key = null)
{ {
if (isset($this->referenceField)) { if (isset($this->referenceField)) {
$value = $this->reference->get($this->relation->getLocal());
if ($value !== null) {
$record->set($this->referenceField, $value, false);
} else {
$record->set($this->referenceField, $this->reference, false); $record->set($this->referenceField, $this->reference, false);
} }
}
/** /**
* for some weird reason in_array cannot be used here (php bug ?) * for some weird reason in_array cannot be used here (php bug ?)
* *