Permalink
Browse files

fixes #6506, notice on 5.2.10 for habtm save with empty value

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8251 3807eeeb-6ff5-0310-8944-8be069107fe0
  • Loading branch information...
1 parent 93d64c4 commit 30281d6c59cf537693e988a06a3d22784ad07052 gwoo committed Jul 23, 2009
Showing with 3 additions and 3 deletions.
  1. +3 −3 cake/libs/model/model.php
@@ -372,7 +372,7 @@ function __construct($id = false, $table = null, $ds = null) {
} elseif ($table) {
$this->useTable = $table;
}
-
+
if ($ds !== null) {
$this->useDbConfig = $ds;
}
@@ -827,7 +827,7 @@ function deconstruct($field, $data) {
$type = $this->getColumnType($field);
if (in_array($type, array('datetime', 'timestamp', 'date', 'time'))) {
- $useNewDate = (isset($data['year']) || isset($data['month']) ||
+ $useNewDate = (isset($data['year']) || isset($data['month']) ||
isset($data['day']) || isset($data['hour']) || isset($data['minute']));
$dateFields = array('Y' => 'year', 'm' => 'month', 'd' => 'day', 'H' => 'hour', 'i' => 'min', 's' => 'sec');
@@ -1343,7 +1343,7 @@ function __saveMulti($joined, $id) {
unset($values);
} elseif (isset($row[$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
$newData[] = $row;
- } elseif (isset($row[$join][$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
+ } elseif (isset($row[$join]) && isset($row[$join][$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
$newData[] = $row[$join];
}
}

0 comments on commit 30281d6

Please sign in to comment.