diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php
index 79b698a1e..8b7c03d13 100644
--- a/classes/db/DB.class.php
+++ b/classes/db/DB.class.php
@@ -432,16 +432,28 @@
                         $value = '%'.$value.'%';
                     break;
                 case 'notin' :
-						if(!is_array($value)) $value = array($value);
-			            $value = $this->addQuotesArray($value);
-						if($type=='number') return join(',',$value);
-						else return "'". join("','",$value)."'";
+						if(is_array($value))
+						{
+							$value = $this->addQuotesArray($value);
+							if($type=='number') return join(',',$value);
+							else return "'". join("','",$value)."'";
+						}
+						else
+						{
+							return $value;
+						}
                     break;
                 case 'in' :
-						if(!is_array($value)) $value = array($value);
-			            $value = $this->addQuotesArray($value);
-						if($type=='number') return join(',',$value);
-						else return "'". join("','",$value)."'";
+						if(is_array($value))
+						{
+							$value = $this->addQuotesArray($value);
+							if($type=='number') return join(',',$value);
+							else return "'". join("','",$value)."'";
+						}
+						else
+						{
+							return $value;
+						}
                     break;
                 case 'between' :
 						if(!is_array($value)) $value = array($value);