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

20160611

Browse Source
This commit is contained in:
cuiliang
2016-06-11 19:49:57 +08:00
parent 13e014b7d9 89ad1f534a
commit cd9caf65d2
2065 changed files with 88639 additions and 74804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
framework/data/ArrayDataProvider.php
View File

@@ -63,7 +63,12 @@ class ArrayDataProvider extends BaseDataProvider
* The array elements must use zero-based integer keys.
*/
public $allModels;
/**
* @var string the name of the [[yii\base\Model|Model]] class that will be represented.
* This property is used to get columns' names.
* @since 2.0.9
*/
public $modelClass;
/**
* @inheritdoc
@@ -82,11 +87,15 @@ 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
}
}