Merge branch 'frameworks'

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

1 files changed, 3 insertions, 16 deletions

diff --git a/codebase/grid_connector.php b/codebase/grid_connector.php
index a39e30c..6f41467 100644
--- a/codebase/grid_connector.php
+++ b/codebase/grid_connector.php
@@ -14,14 +14,12 @@ require_once("grid_config.php");
 class GridDataItem extends DataItem{
 	protected $row_attrs;//!< hash of row attributes
 	protected $cell_attrs;//!< hash of cell attributes
-	protected $userdata;
 	
 	function __construct($data,$name,$index=0){
 		parent::__construct($data,$name,$index);
 		
 		$this->row_attrs=array();
 		$this->cell_attrs=array();
-		$this->userdata=array();
 	}
 	/*! set color of row
 		
@@ -73,17 +71,6 @@ class GridDataItem extends DataItem{
 		$this->cell_attrs[$name][$attr]=$value;
 	}
 	
-	/*! set userdata section for the item
-		
-		@param name
-			name of userdata
-		@param value
-			value of userdata
-	*/
-	function set_userdata($name, $value){
-		$this->userdata[$name]=$value;
-	}
-		
 	/*! set custom row attribute
 		
 		@param attr
@@ -115,8 +102,9 @@ class GridDataItem extends DataItem{
 			$value = isset($this->data[$name]) ? $this->data[$name] : '';
 			$str.="><![CDATA[".$value."]]></cell>";
 		}
-		foreach ($this->userdata as $key => $value)
-			$str.="<userdata name='".$key."'><![CDATA[".$value."]]></userdata>";
+		if ($this->userdata !== false)
+			foreach ($this->userdata as $key => $value)
+				$str.="<userdata name='".$key."'><![CDATA[".$value."]]></userdata>";
 			
 		return $str;
 	}
@@ -272,5 +260,4 @@ class GridDataProcessor extends DataProcessor{
 		return $data;
 	}
 }
-
 ?>
\ No newline at end of file