Merge pull request #1915 from antonCPU/fixed-data-provider-iterator-init

CDataProviderIterator: fixed init in case of disabled pagination
yiisoft · Jan 2, 2013 · 13f6b59 · 13f6b59
2 parents 2e016dc + e96222a
commit 13f6b59
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -3,6 +3,7 @@
 
 Version 1.1.14 work in progress
 -------------------------------
+- Bug #1915: CDataProviderIterator: fixed init in case of disabled pagination (antoncpu)
 
 Version 1.1.13 December 30, 2012
 --------------------------------

diff --git a/framework/web/CDataProviderIterator.php b/framework/web/CDataProviderIterator.php
@@ -51,7 +51,7 @@ public function __construct(CDataProvider $dataProvider, $pageSize=null)
 		$this->_totalItemCount=$dataProvider->getTotalItemCount();
 
 		if(($pagination=$this->_dataProvider->getPagination())===false)
-			$this->_dataProvider->setPagination(new CPagination());
+			$this->_dataProvider->setPagination($pagination=new CPagination());
 
 		if($pageSize!==null)
 			$pagination->setPageSize($pageSize);

diff --git a/tests/framework/web/CDataProviderIteratorTest.php b/tests/framework/web/CDataProviderIteratorTest.php
@@ -40,6 +40,17 @@ public function testIterator($pageSize)
 		$this->assertEquals(100, $n);
 	}
 
+	/**
+	 * @dataProvider pageSizes
+	 */
+	public function testInitWithDisabledPagination($pageSizes)
+	{
+		$dataProvider = new CArrayDataProvider($this->generateData(10), array(
+			'pagination' => false,
+		));
+		new CDataProviderIterator($dataProvider, $pageSizes);
+	}
+
 	/**
 	 * Generates some data to fill a dataProvider
 	 * @param integer $totalItems the total number of items to generate