php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-23 04:00:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Eliminating

Browse Source
This commit is contained in:
egorpromo
2013-11-16 21:14:53 +07:00
parent b06caa297b
commit a446f3a586
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/yii/data/Pagination.php
View File

@ -83,7 +83,7 @@ class Pagination extends Object
public $route;
/**
* @var array parameters (name => value) that should be used to obtain the current page number
* and to create new pagination URLs. If not set, $_GET will be used instead.
* and to create new pagination URLs. If not set, all parameters from $_GET will be used instead.
*
* The array element indexed by [[pageVar]] is considered to be the current page number.
* If the element does not exist, the current page number is considered 0.
@ -131,7 +131,7 @@ class Pagination extends Object
public function getPage($recalculate = false)
{
if ($this->_page === null || $recalculate) {
$params = $this->params === null ? $_GET : $this->params;
$params = $this->params === null ? Yii::$app->request->get() : $this->params;
if (isset($params[$this->pageVar]) && is_scalar($params[$this->pageVar])) {
$this->_page = (int)$params[$this->pageVar] - 1;
if ($this->validatePage) {
@ -169,7 +169,7 @@ class Pagination extends Object
*/
public function createUrl($page)
{
$params = $this->params === null ? $_GET : $this->params;
$params = $this->params === null ? Yii::$app->request->get() : $this->params;
if ($page > 0 || $page >= 0 && $this->forcePageVar) {
$params[$this->pageVar] = $page + 1;
} else {