From 01a5738f3c7f8553d8203eb565c08beba6e79ca0 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Mon, 15 Mar 2010 23:14:23 -0400
Subject: [PATCH]  Effectively reverting changes made in
 [190066fd51c222de91989aec97b0042d7bcda7c9] which caused conditions using a
 falsey values to be removed.

---
 cake/libs/model/model.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index c0ad6aaa142..184a75feefa 100644
--- 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(
-						array($join . '.' . $this->hasAndBelongsToMany[$assoc]['foreignKey'] => $id),
-						(array)$this->hasAndBelongsToMany[$assoc]['conditions']
-					));
+					$conditions = array(
+						$join . '.' . $this->hasAndBelongsToMany[$assoc]['foreignKey'] => $id
+					);
+					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,