From f6c1560ebc0bb63ec43425693384948b80e9be4b Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Tue, 14 Aug 2007 20:44:48 +0000
Subject: [PATCH]

---
 lib/Doctrine/Query/Abstract.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/Doctrine/Query/Abstract.php b/lib/Doctrine/Query/Abstract.php
index 72bc33b3e..901f2a872 100644
--- a/lib/Doctrine/Query/Abstract.php
+++ b/lib/Doctrine/Query/Abstract.php
@@ -79,13 +79,9 @@ abstract class Doctrine_Query_Abstract extends Doctrine_Hydrate
      * @param mixed $params         an array of parameters or a simple scalar
      * @return Doctrine_Query
      */
-    public function whereIn($params = array())
+    public function whereIn($expr, $params = array())
     {
-        if (is_array($params)) {
-            $this->_params = array_merge($this->_params, $params);
-        } else {
-            $this->_params[] = $params;
-        }
+        $params = (array) $params;
         $a = array();
         foreach ($params as $k => $value) {
             if ($value instanceof Doctrine_Expression) {
@@ -96,6 +92,9 @@ abstract class Doctrine_Query_Abstract extends Doctrine_Hydrate
             }
             $a[] = $value;
         }
+
+        $this->_params = array_merge($this->_params, $params);
+
         $where = $expr . ' IN (' . implode(', ', $a) . ')';
 
         return $this->parseQueryPart('where', $where, true);