[fix] version 4.3.1

3 files changed, 16 insertions, 8 deletions

diff --git a/codebase/connector/db_common.php b/codebase/connector/db_common.php
index effc291..f6391d2 100644
--- a/codebase/connector/db_common.php
+++ b/codebase/connector/db_common.php
@@ -793,13 +793,20 @@ abstract class DBDataWrapper extends DataWrapper{
 		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 @@ class ArrayDBDataWrapper extends DBDataWrapper{
         }
 
 		$relation_id = $this->config->relation_id["db_name"];
+		$result = array();
 
         for ($i = 0; $i < count($this->connection); $i++) {
             $item = $this->connection[$i];
diff --git a/codebase/connector/strategy.php b/codebase/connector/strategy.php
index 39c0188..344dcf2 100644
--- a/codebase/connector/strategy.php
+++ b/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);
diff --git a/codebase/connector/tree_connector.php b/codebase/connector/tree_connector.php
index 814fb12..6f857d0 100644
--- a/codebase/connector/tree_connector.php
+++ b/codebase/connector/tree_connector.php
@@ -121,7 +121,7 @@ class TreeDataItem extends DataItem{
 	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."' ";