Commit 094dab1d authored by wernerm's avatar wernerm

Changed the link() method's use of getLocal() and getForeign() to...

Changed the link() method's use of getLocal() and getForeign() to getLocalFieldName() and getForeignFieldName().
parent c655b602
...@@ -1705,12 +1705,12 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1705,12 +1705,12 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
if ($rel instanceof Doctrine_Relation_Association) { if ($rel instanceof Doctrine_Relation_Association) {
$modelClassName = $rel->getAssociationTable()->getComponentName(); $modelClassName = $rel->getAssociationTable()->getComponentName();
$localFieldName = $rel->getLocal(); $localFieldName = $rel->getLocalFieldName();
$localFieldDef = $rel->getAssociationTable()->getColumnDefinition($localFieldName); $localFieldDef = $rel->getAssociationTable()->getColumnDefinition($localFieldName);
if ($localFieldDef['type'] == 'integer') { if ($localFieldDef['type'] == 'integer') {
$identifier = (integer) $identifier; $identifier = (integer) $identifier;
} }
$foreignFieldName = $rel->getForeign(); $foreignFieldName = $rel->getForeignFieldName();
$foreignFieldDef = $rel->getAssociationTable()->getColumnDefinition($foreignFieldName); $foreignFieldDef = $rel->getAssociationTable()->getColumnDefinition($foreignFieldName);
if ($foreignFieldDef['type'] == 'integer') { if ($foreignFieldDef['type'] == 'integer') {
for ($i = 0; $i < count($ids); $i++) { for ($i = 0; $i < count($ids); $i++) {
...@@ -1742,7 +1742,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count ...@@ -1742,7 +1742,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
$q = new Doctrine_Query(); $q = new Doctrine_Query();
$q->update($this->getTable()->getComponentName()) $q->update($this->getTable()->getComponentName())
->set($rel->getLocal(), '?', $ids); ->set($rel->getLocalFieldName(), '?', $ids);
if (count($ids) > 0) { if (count($ids) > 0) {
$q->whereIn($rel->getTable()->getIdentifier(), array_values($this->identifier())); $q->whereIn($rel->getTable()->getIdentifier(), array_values($this->identifier()));
......
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