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

yiichina

Browse Source
This commit is contained in:
cuiliang
2016-03-02 18:50:50 +08:00
parent c6048ea93d 3153c6d500
commit 13e014b7d9
707 changed files with 52230 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/data/ArrayDataProvider.php
View File

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