No commit message

framework/web/CActiveDataProvider.php

@@ -83,15 +83,14 @@ public function setCriteria($value)
 
 	/**
 	 * Fetches the data from the persistent data storage.
-	 * @param boolean whether this call is triggered by an explicit refresh
 	 * @return array list of data items
 	 */
-	protected function fetchData($refresh)
+	protected function fetchData()
 	{
 		$criteria=clone $this->getCriteria();
 		if(($pagination=$this->getPagination())!==false)
 		{
-			$pagination->setItemCount($this->getTotalCount($refresh));
+			$pagination->setItemCount($this->getTotalCount(true));
 			$pagination->applyLimit($criteria);
 		}
 		if(($sort=$this->getSort())!==false)
@@ -109,15 +108,14 @@ protected function fetchData($refresh)
 
 	/**
 	 * Fetches the data item keys from the persistent data storage.
-	 * @param boolean whether this call is triggered by an explicit refresh
 	 * @return array list of data item keys.
 	 */
-	protected function fetchKeys($refresh)
+	protected function fetchKeys()
 	{
 		$keys=array();
 		if($this->keyAttribute===null)
 		{
-			foreach($this->getData($refresh) as $i=>$data)
+			foreach($this->getData() as $i=>$data)
 				$keys[$i]=$data->getPrimaryKey();
 		}
 		else
@@ -130,10 +128,9 @@ protected function fetchKeys($refresh)
 
 	/**
 	 * Calculates the total number of data items.
-	 * @param boolean whether this call is triggered by an explicit refresh
 	 * @return integer the total number of data items.
 	 */
-	protected function calculateTotalCount($refresh)
+	protected function calculateTotalCount()
 	{
 		$finder=CActiveRecord::model($this->modelClass);
 		if($this->with===null)

framework/web/CDataProvider.php

@@ -21,22 +21,19 @@ abstract class CDataProvider extends CComponent implements IDataProvider
 
 	/**
 	 * Fetches the data from the persistent data storage.
-	 * @param boolean whether this call is triggered by an explicit refresh
 	 * @return array list of data items
 	 */
-	abstract protected function fetchData($refresh);
+	abstract protected function fetchData();
 	/**
 	 * Fetches the data item keys from the persistent data storage.
-	 * @param boolean whether this call is triggered by an explicit refresh
 	 * @return array list of data item keys.
 	 */
-	abstract protected function fetchKeys($refresh);
+	abstract protected function fetchKeys();
 	/**
 	 * Calculates the total number of data items.
-	 * @param boolean whether this call is triggered by an explicit refresh
 	 * @return integer the total number of data items.
 	 */
-	abstract protected function calculateTotalCount($refresh);
+	abstract protected function calculateTotalCount();
 
 	/**
 	 * @return string the unique ID that uniquely identifies the data provider among all data providers.
@@ -122,7 +119,7 @@ public function setSort($value)
 	public function getData($refresh=false)
 	{
 		if($this->_data===null || $refresh)
-			$this->_data=$this->fetchData($refresh);
+			$this->_data=$this->fetchData();
 		return $this->_data;
 	}
 
@@ -143,7 +140,7 @@ public function setData($value)
 	public function getKeys($refresh=false)
 	{
 		if($this->_keys===null || $refresh)
-			$this->_keys=$this->fetchKeys($refresh);
+			$this->_keys=$this->fetchKeys();
 		return $this->_keys;
 	}
 
@@ -166,7 +163,7 @@ public function setKeys($value)
 	public function getTotalCount($refresh=false)
 	{
 		if($this->_totalCount===null || $refresh)
-			$this->_totalCount=$this->calculateTotalCount($refresh);
+			$this->_totalCount=$this->calculateTotalCount();
 		return $this->_totalCount;
 	}
 }