Commit 91cd62be by Qiang Xue

Fixes #3715: Fixed the bug that using a custom pager/sorter with `GridView` may…

Fixes #3715: Fixed the bug that using a custom pager/sorter with `GridView` may generate two different pagers/sorters if the layout configures two pagers/sorters
parent 01e5ffdc
...@@ -37,6 +37,7 @@ Yii Framework 2 Change Log ...@@ -37,6 +37,7 @@ Yii Framework 2 Change Log
- Bug #3578: Fixed postgreSQL column type detection, added missing types (MDMunir, cebe) - Bug #3578: Fixed postgreSQL column type detection, added missing types (MDMunir, cebe)
- Bug #3591: Fixed incomplete obsolete filling in i18n `MessageController::saveMessagesToDb()` (advsm) - Bug #3591: Fixed incomplete obsolete filling in i18n `MessageController::saveMessagesToDb()` (advsm)
- Bug #3601: Fixed the bug that the refresh URL was not generated correctly by `Captcha` (qiangxue, klevron) - Bug #3601: Fixed the bug that the refresh URL was not generated correctly by `Captcha` (qiangxue, klevron)
- Bug #3715: Fixed the bug that using a custom pager/sorter with `GridView` may generate two different pagers/sorters if the layout configures two pagers/sorters (qiangxue)
- Bug: Fixed inconsistent return of `\yii\console\Application::runAction()` (samdark) - Bug: Fixed inconsistent return of `\yii\console\Application::runAction()` (samdark)
- Bug: URL encoding for the route parameter added to `\yii\web\UrlManager` (klimov-paul) - Bug: URL encoding for the route parameter added to `\yii\web\UrlManager` (klimov-paul)
- Bug: Fixed the bug that requesting protected or private action methods would cause 500 error instead of 404 (qiangxue) - Bug: Fixed the bug that requesting protected or private action methods would cause 500 error instead of 404 (qiangxue)
......
...@@ -219,8 +219,8 @@ abstract class BaseListView extends Widget ...@@ -219,8 +219,8 @@ abstract class BaseListView extends Widget
return ''; return '';
} }
/** @var LinkPager $class */ /** @var LinkPager $class */
$class = ArrayHelper::remove($this->pager, 'class', LinkPager::className());
$pager = $this->pager; $pager = $this->pager;
$class = ArrayHelper::remove($pager, 'class', LinkPager::className());
$pager['pagination'] = $pagination; $pager['pagination'] = $pagination;
$pager['view'] = $this->getView(); $pager['view'] = $this->getView();
...@@ -238,8 +238,8 @@ abstract class BaseListView extends Widget ...@@ -238,8 +238,8 @@ abstract class BaseListView extends Widget
return ''; return '';
} }
/** @var LinkSorter $class */ /** @var LinkSorter $class */
$class = ArrayHelper::remove($this->sorter, 'class', LinkSorter::className());
$sorter = $this->sorter; $sorter = $this->sorter;
$class = ArrayHelper::remove($sorter, 'class', LinkSorter::className());
$sorter['sort'] = $sort; $sorter['sort'] = $sort;
$sorter['view'] = $this->getView(); $sorter['view'] = $this->getView();
......
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