php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-02 21:41:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #2655: Arrayable and ArrayableTrait are incompatible for some PHP versions.

Browse Source
This commit is contained in:
Qiang Xue
2014-03-07 19:08:27 -05:00
parent 6d97ded6c6
commit fad635440b
15 changed files with 131 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/helpers/BaseJson.php
View File

@ -91,7 +91,11 @@ class BaseJson
} elseif ($data instanceof Arrayable) {
$data = $data->toArray();
} else {
$data = get_object_vars($data);
$result = [];
foreach ($data as $name => $value) {
$result[$name] = $value;
}
$data = $result;
}
if ($data === []) {