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

merge from master

Browse Source
This commit is contained in:
cuiliang
2016-06-11 20:16:28 +08:00
parent 7fd063c8a9
commit c0df003ac0
530 changed files with 5 additions and 54272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/data/ArrayDataProvider.php
View File

@@ -87,15 +87,7 @@ class ArrayDataProvider extends BaseDataProvider
$pagination->totalCount = $this->getTotalCount();
if ($pagination->getPageSize() > 0) {
<<<<<<< HEAD
<<<<<<< HEAD
$models = array_slice($models, $pagination->getOffset(), $pagination->getLimit());
=======
$models = array_slice($models, $pagination->getOffset(), $pagination->getLimit(), true);
>>>>>>> yiichina/master
=======
$models = array_slice($models, $pagination->getOffset(), $pagination->getLimit(), true);
>>>>>>> master
}
}