Effectively reverting changes made in

[190066f] which caused conditions using a falsey values to be removed.
cakephp · Mar 16, 2010 · 01a5738 · 01a5738
1 parent 661fcd3
commit 01a5738
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
@@ -1370,10 +1370,12 @@ function __saveMulti($joined, $id) {
 				}
 
 				if ($this->hasAndBelongsToMany[$assoc]['unique']) {
-					$conditions = array_filter(array_merge(
+					$conditions = array(
-						array($join . '.' . $this->hasAndBelongsToMany[$assoc]['foreignKey'] => $id),
+						$join . '.' . $this->hasAndBelongsToMany[$assoc]['foreignKey'] => $id
-						(array)$this->hasAndBelongsToMany[$assoc]['conditions']
+					);
-					));
+					if (!empty($this->hasAndBelongsToMany[$assoc]['conditions'])) {
+						$conditions = array_merge($conditions, (array)$this->hasAndBelongsToMany[$assoc]['conditions']);
+					}
 					$links = $this->{$join}->find('all', array(
 						'conditions' => $conditions,
 						'recursive' => empty($this->hasAndBelongsToMany[$assoc]['conditions']) ? -1 : 0,