From 0bdb6d7e1d5d399071264c81f10bbdfcecff7cae Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Thu, 3 May 2007 12:08:28 +0000
Subject: [PATCH] Adding fix for #2522, fixes errors when primary key is not
auto increment and the primary key is set in the data to be saved.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4995 3807eeeb-6ff5-0310-8944-8be069107fe0
---
cake/libs/model/model.php | 7 -------
1 file changed, 7 deletions(-)
diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 8e4678188..fcdaf32de 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -1039,8 +1039,6 @@ class Model extends Overloadable {
$weHaveMulti = false;
}
- $newID = null;
-
foreach($this->data as $n => $v) {
if (isset($weHaveMulti) && isset($v[$n]) && $count > 0 && count($this->hasAndBelongsToMany) > 0) {
$joined[] = $v;
@@ -1056,10 +1054,6 @@ class Model extends Overloadable {
if ($this->hasField($x) && ($whitelist && in_array($x, $fieldList) || !$whitelist)) {
$fields[] = $x;
$values[] = $y;
-
- if ($x == $this->primaryKey && !empty($y)) {
- $newID = $y;
- }
}
}
}
@@ -1103,7 +1097,6 @@ class Model extends Overloadable {
foreach ($this->belongsTo as $parent => $assoc) {
if (isset($assoc['counterCache']) && !empty($assoc['counterCache'])) {
$parentObj =& $this->{$assoc['className']};
-
}
}
}