CDataProvider fix - issue #1546

yiisoft · Oct 8, 2012 · 83f9bc6 · 83f9bc6
1 parent 7cc307d
commit 83f9bc6
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/framework/web/CDataProvider.php b/framework/web/CDataProvider.php
@@ -94,7 +94,14 @@ public function setPagination($value)
 	{
 		if(is_array($value))
 		{
-			$pagination=isset($value['class']) ? $this->getPagination($value['class']) : $this->getPagination();
+			if(isset($value['class']))
+			{
+				$pagination=$this->getPagination($value['class']);
+				unset($value['class']);
+			}
+			else
+				$pagination=$this->getPagination();
+
 			foreach($value as $k=>$v)
 				$pagination->$k=$v;
 		}
@@ -135,7 +142,14 @@ public function setSort($value)
 	{
 		if(is_array($value))
 		{
-			$sort=isset($value['class']) ? $this->getSort($value['class']) : $this->getSort();
+			if(isset($value['class']))
+			{
+				$sort=$this->getSort($value['class']);
+				unset($value['class']);
+			}
+			else
+				$sort=$this->getSort();
+
 			foreach($value as $k=>$v)
 				$sort->$k=$v;
 		}