php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 14:26:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #17156: Fixes PHP 7.2 warning when a data provider has no data as a parameter for a GridView

Browse Source
This commit is contained in:
evilito
2019-02-28 03:02:08 -05:00
committed by Alexander Makarov
parent b77e3ea0e7
commit 8cc74f5c57
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/CHANGELOG.md
View File

@ -4,7 +4,7 @@ Yii Framework 2 Change Log
2.0.17 under development
------------------------
- no changes in this release.
- Bug #17156: Fixes PHP 7.2 warning when a data provider has no data as a parameter for a GridView (evilito)
2.0.16.1 February 28, 2019

2
framework/data/ArrayDataProvider.php
View File

@ -123,7 +123,7 @@ class ArrayDataProvider extends BaseDataProvider
*/
protected function prepareTotalCount()
{
return count($this->allModels);
return is_array($this->allModels) ? count($this->allModels) : 0;
}
/**