Skip to content

Y
yii2
Commit 0c505fca by Carsten Brandt
Options

Merge pull request #1207 from egorpromo/eliminate_get

Eliminating $_GET array
parents 5b36503c a446f3a5
Showing with 3 additions and 3 deletions
framework/yii/data/Pagination.php
......@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment