From 094dab1d4f037e1127922e885ba0761aba047574 Mon Sep 17 00:00:00 2001
From: wernerm <wernerm@625475ce-881a-0410-a577-b389adb331d8>
Date: Tue, 11 Dec 2007 11:31:13 +0000
Subject: [PATCH] Changed the link() method's use of getLocal() and
 getForeign() to getLocalFieldName() and getForeignFieldName().

---
 lib/Doctrine/Record.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Doctrine/Record.php b/lib/Doctrine/Record.php
index 164002cdb..10766a643 100644
--- a/lib/Doctrine/Record.php
+++ b/lib/Doctrine/Record.php
@@ -1705,12 +1705,12 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
         if ($rel instanceof Doctrine_Relation_Association) {
 
             $modelClassName = $rel->getAssociationTable()->getComponentName();
-            $localFieldName = $rel->getLocal();
+            $localFieldName = $rel->getLocalFieldName();
             $localFieldDef  = $rel->getAssociationTable()->getColumnDefinition($localFieldName);
             if ($localFieldDef['type'] == 'integer') {
                 $identifier = (integer) $identifier;
             }
-            $foreignFieldName = $rel->getForeign();
+            $foreignFieldName = $rel->getForeignFieldName();
             $foreignFieldDef  = $rel->getAssociationTable()->getColumnDefinition($foreignFieldName);
             if ($foreignFieldDef['type'] == 'integer') {
                 for ($i = 0; $i < count($ids); $i++) {
@@ -1742,7 +1742,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
             $q = new Doctrine_Query();
 
             $q->update($this->getTable()->getComponentName())
-              ->set($rel->getLocal(), '?', $ids);
+              ->set($rel->getLocalFieldName(), '?', $ids);
 
             if (count($ids) > 0) {
                 $q->whereIn($rel->getTable()->getIdentifier(), array_values($this->identifier()));