[update] version 3.2.1

Author: AlexKlimenkov

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "gantt",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "homepage": "http://dhtmlx.com/docs/products/dhtmlxGantt/",
   "description": "An open source JavaScript Gantt chart that helps you illustrate a project schedule in a nice-looking chart.",
   "main": [

codebase/connector/db_common.php

@@ -793,13 +793,20 @@ protected function build_where($rules,$relation=false){
 		for ($i=0; $i < sizeof($rules); $i++)
 			if (is_string($rules[$i]))
 				array_push($sql,"(".$rules[$i].")");
-			else
-				if ($rules[$i]["value"]!=""){
-					if (!$rules[$i]["operation"])
-						array_push($sql,$this->escape_name($rules[$i]["name"])." LIKE '%".$this->escape($rules[$i]["value"])."%'");
-					else
-						array_push($sql,$this->escape_name($rules[$i]["name"])." ".$rules[$i]["operation"]." '".$this->escape($rules[$i]["value"])."'");
+			else {
+				$filtervalue = $rules[$i]["value"];
+				$filteroperation = $rules[$i]["operation"];
+				if ($filtervalue!=""){
+					if (!$filteroperation)
+						array_push($sql,$this->escape_name($rules[$i]["name"])." LIKE '%".$this->escape($filtervalue)."%'");
+					else {
+						if ($filteroperation != "IN") 
+							$filtervalue = "'".$this->escape($filtervalue)."'";
+
+						array_push($sql,$this->escape_name($rules[$i]["name"])." ".$filteroperation." ".$filtervalue);
+					}
 				}
+			}
 
 		if ($relation !== false && $relation !== ""){
 			$relsql = $this->escape_name($this->config->relation_id["db_name"])." = '".$this->escape($relation)."'";
@@ -1053,6 +1060,7 @@ public function select($sql){
         }
 
 		$relation_id = $this->config->relation_id["db_name"];
+		$result = array();
 
         for ($i = 0; $i < count($this->connection); $i++) {
             $item = $this->connection[$i];

codebase/connector/strategy.php

@@ -245,7 +245,7 @@ class MultitableTreeRenderStrategy extends TreeRenderStrategy {
 
 	private $level = 0;
 	private $max_level = null;
-	protected $sep = ",";
+	protected $sep = "-@level@-";
 
 	public function __construct($conn) {
 		parent::__construct($conn);

codebase/connector/tree_connector.php

@@ -121,7 +121,7 @@ function set_image($img_folder_closed,$img_folder_open=false,$img_leaf=false){
 	function to_xml_start(){
 		if ($this->skip) return "";
 
-		$str1="<item id='".$this->get_id()."' text='".$this->xmlentities($this->data[$this->config->text[0]["name"]])."' ";
+		$str1="<item id='".$this->xmlentities($this->get_id())."' text='".$this->xmlentities($this->data[$this->config->text[0]["name"]])."' ";
 		if ($this->has_kids()==true) $str1.="child='".$this->has_kids()."' ";
 		if ($this->im0) $str1.="im0='".$this->im0."' ";
 		if ($this->im1) $str1.="im1='".$this->im1."' ";