From dc893ec66933a288a7e02bdf8eb9c0b051047b03 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 28 Jul 2013 08:59:44 -0400
Subject: [PATCH] Added DataProvider::id

---
 framework/yii/data/DataProvider.php | 29 +++++++++++++++++++++++++++--
 framework/yii/widgets/LinkPager.php |  2 +-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/framework/yii/data/DataProvider.php b/framework/yii/data/DataProvider.php
index 5003d05..1d4b785 100644
--- a/framework/yii/data/DataProvider.php
+++ b/framework/yii/data/DataProvider.php
@@ -21,6 +21,13 @@ use yii\base\InvalidParamException;
  */
 abstract class DataProvider extends Component implements IDataProvider
 {
+	/**
+	 * @var string an ID that uniquely identifies the data provider among all data providers.
+	 * You should set this property if the same page contains two or more different data providers.
+	 * Otherwise, the [[pagination]] and [[sort]] mainly not work properly.
+	 */
+	public $id;
+
 	private $_sort;
 	private $_pagination;
 
@@ -31,6 +38,9 @@ abstract class DataProvider extends Component implements IDataProvider
 	{
 		if ($this->_pagination === null) {
 			$this->_pagination = new Pagination;
+			if ($this->id !== null) {
+				$this->_pagination->pageVar = $this->id . '-page';
+			}
 		}
 		return $this->_pagination;
 	}
@@ -50,7 +60,13 @@ abstract class DataProvider extends Component implements IDataProvider
 	public function setPagination($value)
 	{
 		if (is_array($value)) {
-			$this->_pagination = Yii::createObject(array_merge(array('class' => 'yii\data\Pagination'), $value));
+			$config = array(
+				'class' => Pagination::className(),
+			);
+			if ($this->id !== null) {
+				$config['pageVar'] = $this->id . '-page';
+			}
+			$this->_pagination = Yii::createObject(array_merge($config, $value));
 		} elseif ($value instanceof Pagination || $value === false) {
 			$this->_pagination = $value;
 		} else {
@@ -65,6 +81,9 @@ abstract class DataProvider extends Component implements IDataProvider
 	{
 		if ($this->_sort === null) {
 			$this->_sort = new Sort;
+			if ($this->id !== null) {
+				$this->_sort->pageVar = $this->id . '-sort';
+			}
 		}
 		return $this->_sort;
 	}
@@ -84,7 +103,13 @@ abstract class DataProvider extends Component implements IDataProvider
 	public function setSort($value)
 	{
 		if (is_array($value)) {
-			$this->_sort = Yii::createObject(array_merge(array('class' => 'yii\data\Sort'), $value));
+			$config = array(
+				'class' => Sort::className(),
+			);
+			if ($this->id !== null) {
+				$config['sortVar'] = $this->id . '-sort';
+			}
+			$this->_sort = Yii::createObject(array_merge($config, $value));
 		} elseif ($value instanceof Sort || $value === false) {
 			$this->_sort = $value;
 		} else {
diff --git a/framework/yii/widgets/LinkPager.php b/framework/yii/widgets/LinkPager.php
index 4fef971..885432d 100644
--- a/framework/yii/widgets/LinkPager.php
+++ b/framework/yii/widgets/LinkPager.php
@@ -101,7 +101,7 @@ class LinkPager extends Widget
 			throw new InvalidConfigException('The "pagination" property must be set.');
 		}
 		if ($this->template === null) {
-			$this->template = '<label>' . Yii::t('yii', 'Go to page:') . '</label> {pages}';
+			$this->template = '{pages}';
 		}
 	}