From 64d458715b1018b039d1bafca3cf9dcec511074f Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Wed, 9 Mar 2016 11:26:56 +0100
Subject: Removed deprecated code

---
 framework/Web/THttpRequest.php                          |  2 +-
 framework/Web/UI/ActiveControls/TCallbackClientSide.php | 10 +++-------
 framework/Web/UI/WebControls/TDataGrid.php              |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'framework/Web')

diff --git a/framework/Web/THttpRequest.php b/framework/Web/THttpRequest.php
index 2a5b812d..926cfa46 100644
--- a/framework/Web/THttpRequest.php
+++ b/framework/Web/THttpRequest.php
@@ -816,7 +816,7 @@ class THttpRequest extends TApplicationComponent implements IteratorAggregate,Ar
 	 */
 	public function getIterator()
 	{
-		return new TMapIterator($this->_items);
+		return new ArrayIterator($this->_items);
 	}
 
 	/**
diff --git a/framework/Web/UI/ActiveControls/TCallbackClientSide.php b/framework/Web/UI/ActiveControls/TCallbackClientSide.php
index 113b35ce..4cb482ad 100644
--- a/framework/Web/UI/ActiveControls/TCallbackClientSide.php
+++ b/framework/Web/UI/ActiveControls/TCallbackClientSide.php
@@ -240,8 +240,7 @@ class TCallbackClientSide extends TClientSideOptions
 	 */
 	public function getHasPriority()
 	{
-		$option =  $this->getOption('HasPriority');
-		return ($option===null) ? true : $option;
+		return true;
 	}
 
 	/**
@@ -252,9 +251,8 @@ class TCallbackClientSide extends TClientSideOptions
 	 */
 	public function setHasPriority($value)
 	{
-		$hasPriority = TPropertyValue::ensureBoolean($value);
-		$this->setOption('HasPriority', $hasPriority);
-		if(!$hasPriority)
+		// mimic the old behavior
+		if(!$value)
 			$this->setEnablePageStateUpdate(false);
 	}
 
@@ -268,8 +266,6 @@ class TCallbackClientSide extends TClientSideOptions
 	{
 		$enabled = TPropertyValue::ensureBoolean($value);
 		$this->setOption('EnablePageStateUpdate', $enabled);
-		if($enabled)
-			$this->setHasPriority(true);
 	}
 
 	/**
diff --git a/framework/Web/UI/WebControls/TDataGrid.php b/framework/Web/UI/WebControls/TDataGrid.php
index 9403fa45..2f338d22 100644
--- a/framework/Web/UI/WebControls/TDataGrid.php
+++ b/framework/Web/UI/WebControls/TDataGrid.php
@@ -1162,7 +1162,7 @@ class TDataGrid extends TBaseDataList implements INamingContainer
 		$param=new TDataGridItemEventParameter($item);
 		if($dataBind)
 		{
-			$item->setDataItem($dataItem);
+			$item->setData($dataItem);
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
 			$item->dataBind();
-- 
cgit v1.2.3