Misc changes.

git-svn-id: svn://svn.zabbix.com/trunk@3413 97f52cf1-0a1b-0410-bd0e-c28be96e8082

3 files changed, 10 insertions, 3 deletions

diff --git a/frontends/php/include/classes/ctag.inc.php b/frontends/php/include/classes/ctag.inc.php
index c5cfc7c8..00f81eda 100644
--- a/frontends/php/include/classes/ctag.inc.php
+++ b/frontends/php/include/classes/ctag.inc.php
@@ -93,7 +93,10 @@
 		function ShowEnd()	{	echo $this->EndToString();	}
 		function Show($destroy=true)	{	echo $this->ToString($destroy);		}
 
-		function Destroy()	{	$this = null;			}
+		function Destroy()	{
+### TODO Problem under PHP 5.0  "Fatal error: Cannot re-assign $this in ..."
+#			$this = null;
+		}
 
 		function StartToString()
 		{
diff --git a/frontends/php/include/classes/ctextbox.inc.php b/frontends/php/include/classes/ctextbox.inc.php
index 1f3ea4a5..97373a03 100644
--- a/frontends/php/include/classes/ctextbox.inc.php
+++ b/frontends/php/include/classes/ctextbox.inc.php
@@ -113,7 +113,11 @@
 		{
 			$res = implode('.',$this->ip_parts);
 			
-			if($destroy) $this = null;
+			if($destroy)
+			{
+### TODO Problem under PHP 5.0  "Fatal error: Cannot re-assign $this in ..."
+#				$this = null;
+			}
 
 			return $res;
 		}
diff --git a/frontends/php/include/classes/graph.inc.php b/frontends/php/include/classes/graph.inc.php
index 753ce648..e36f96c8 100644
--- a/frontends/php/include/classes/graph.inc.php
+++ b/frontends/php/include/classes/graph.inc.php
@@ -949,7 +949,7 @@
 						);
 				}
 
-				$curr_data = &$this->data[$this->items[$i]["itemid"]][$type];
+				$curr_data = &$this->data[$this->items[$i]["itemid"]][$calc_type];
 				$curr_data->count = NULL;
 				$curr_data->min = NULL;
 				$curr_data->max = NULL;