Merge branch 'frameworks'

Conflicts:
	codebase/base_connector.php
	codebase/data_connector.php
	codebase/grid_connector.php
	codebase/scheduler_connector.php

1 files changed, 19 insertions, 2 deletions

diff --git a/codebase/data_connector.php b/codebase/data_connector.php
index 6db082d..a5419e0 100644
--- a/codebase/data_connector.php
+++ b/codebase/data_connector.php
@@ -71,6 +71,11 @@ class CommonDataItem extends DataItem{
 			$name=$this->config->text[$i]["name"];
 			$str.=" ".$name."='".$this->xmlentities($this->data[$name])."'";
 		}
+
+		if ($this->userdata !== false)
+			foreach ($this->userdata as $key => $value)
+				$str.=" ".$key."='".$this->xmlentities($value)."'";
+
 		return $str.">";
 	}
 }
@@ -264,6 +269,11 @@ class JSONCommonDataItem extends DataItem{
 			$extra = $this->config->text[$i]["name"];
 			$data[$extra]=$this->data[$extra];
 		}
+
+		if ($this->userdata !== false)
+			foreach ($this->userdata as $key => $value)
+				$data["key"]=$value;
+
 		return json_encode($data);
 	}
 }
@@ -322,6 +332,10 @@ class TreeCommonDataItem extends CommonDataItem{
 			$str.=" ".$name."='".$this->xmlentities($this->data[$name])."'";
 		}
 		
+		if ($this->userdata !== false)
+			foreach ($this->userdata as $key => $value)
+				$str.=" ".$key."='".$this->xmlentities($value)."'";
+
 		if ($this->kids === true)
 			$str .=" dhx_kids='1'";
 		
@@ -416,6 +430,10 @@ class JSONTreeCommonDataItem extends TreeCommonDataItem{
 			$data[$extra]=$this->data[$extra];
 		}
 
+		if ($this->userdata !== false)
+			foreach ($this->userdata as $key => $value)
+				$data["key"]=$value;
+
 		if ($this->kids === true)
 			$data["dhx_kids"] = 1;
 
@@ -428,5 +446,4 @@ class JSONTreeCommonDataItem extends TreeCommonDataItem{
 }
 
 
-?>
-
+?>
\ No newline at end of file