Mirrors/yii2
2
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2026-03-06 15:28:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #7074: yii\data\ArrayDataProvider did not correctly handle the case Pagination::pageSize = 0

Browse Source
This commit is contained in:
Qiang Xue
2015-01-29 13:27:47 -05:00
parent 73908eaabe
commit 54e35baa1b
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
framework/data/ArrayDataProvider.php
View File

@@ -80,7 +80,10 @@ class ArrayDataProvider extends BaseDataProvider
if (($pagination = $this->getPagination()) !== false) {
$pagination->totalCount = $this->getTotalCount();
$models = array_slice($models, $pagination->getOffset(), $pagination->getLimit());
if ($pagination->getPageSize() > 0) {
$models = array_slice($models, $pagination->getOffset(), $pagination->getLimit());
}
}
return $models;