Skip to content

Y
yii2
Commit effc41c1 by Qiang Xue
Options

minor refactoring.

parent 256ceee7
Showing with 4 additions and 2 deletions
framework/yii/data/Pagination.php
...@@ -133,7 +133,8 @@ class Pagination extends Object ...@@ -133,7 +133,8 @@ class Pagination extends Object
{ {
if ($this->_page === null || $recalculate) { if ($this->_page === null || $recalculate) {
if (($params = $this->params) === null) { if (($params = $this->params) === null) {
$params = (Yii::$app->request instanceof Request) ? Yii::$app->request->get : []; $request = Yii::$app->getRequest();
$params = $request instanceof Request ? $request->get() : [];
} }
if (isset($params[$this->pageVar]) && is_scalar($params[$this->pageVar])) { if (isset($params[$this->pageVar]) && is_scalar($params[$this->pageVar])) {
$this->_page = (int)$params[$this->pageVar] - 1; $this->_page = (int)$params[$this->pageVar] - 1;
...@@ -173,7 +174,8 @@ class Pagination extends Object ...@@ -173,7 +174,8 @@ class Pagination extends Object
public function createUrl($page) public function createUrl($page)
{ {
if (($params = $this->params) === null) { if (($params = $this->params) === null) {
$params = (Yii::$app->request instanceof Request) ? Yii::$app->request->get : []; $request = Yii::$app->getRequest();
$params = $request instanceof Request ? $request->get() : [];
} }
if ($page > 0 || $page >= 0 && $this->forcePageVar) { if ($page > 0 || $page >= 0 && $this->forcePageVar) {
$params[$this->pageVar] = $page + 1; $params[$this->pageVar] = $page + 1;
......
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