From f718229a0417077efd4357d012ae59e3cf390177 Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Tue, 17 Jan 2006 05:30:08 +0000
Subject: [PATCH] Merging fixes to trunk

Revision: [1817]
Adding fix from Ticket #287
Removing a change to DboSource::generateAssociationQuery()

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1818 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 VERSION.txt                                | 2 +-
 cake/libs/model/datasources/dbo_source.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 1aad52d6e..b13f30a98 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -6,4 +6,4 @@
 // +---------------------------------------------------------------------------------------------------+ //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-0.10.6.1816 RC 1
\ No newline at end of file
+0.10.6.1818 RC 1
\ No newline at end of file
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 11796c354..ee72f3e38 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -462,7 +462,7 @@ class DboSource extends DataSource
             }
             else
             {
-                if(isset($this->joinFieldJoin) && !isset($queryData['fields']))
+                if(isset($this->joinFieldJoin))// && !isset($queryData['fields']))
                 {
                     $joinFields = ', ';
                     $joinFields .= join(', ', $this->joinFieldJoin['fields']);
@@ -660,9 +660,9 @@ class DboSource extends DataSource
             $updates[] = $this->name($field).'='.$this->value($value);
         }
 
-        $sql  = 'UPDATE '.$this->name($model->table).' AS '.$this->name($model->name);
+        $sql  = 'UPDATE '.$this->name($model->table);
         $sql .= ' SET '.join(',', $updates);
-        $sql .= ' WHERE '.$model->escapeField($model->primaryKey).'='.$this->value($model->getID());
+        $sql .= ' WHERE '.$this->name($model->primaryKey).'='.$this->value($model->getID());
 
         return $this->execute($sql);
     }