Commit 0319c29f by Qiang Xue

Merge pull request #5895 from otsec/array-helper-to-array-recursive-fix

Fix for recursive calls ArrayHelper::toArray() with objects
parents 58e780ff bcd23926
...@@ -4,6 +4,7 @@ Yii Framework 2 Change Log ...@@ -4,6 +4,7 @@ Yii Framework 2 Change Log
2.0.1 under development 2.0.1 under development
----------------------- -----------------------
- Bug #5893: `yii\helpers\ArrayHelper::toArray()` now applies `$properties` parameter for converting descending objects in recursive calls (otsec)
- Bug #4471: `yii\caching\ApcCache::getValues()` now returns array in case of APC is installed but not enabled in CLI mode (samdark, cebe) - Bug #4471: `yii\caching\ApcCache::getValues()` now returns array in case of APC is installed but not enabled in CLI mode (samdark, cebe)
- Bug #5402: Debugger was not loading when there were closures in asset classes (samdark) - Bug #5402: Debugger was not loading when there were closures in asset classes (samdark)
- Bug #5570: `yii\bootstrap\Tabs` would throw an exception if `content` is not set for one of its `items` (RomeroMsk) - Bug #5570: `yii\bootstrap\Tabs` would throw an exception if `content` is not set for one of its `items` (RomeroMsk)
......
...@@ -81,7 +81,7 @@ class BaseArrayHelper ...@@ -81,7 +81,7 @@ class BaseArrayHelper
} }
} }
return $recursive ? static::toArray($result) : $result; return $recursive ? static::toArray($result, $properties) : $result;
} }
} }
if ($object instanceof Arrayable) { if ($object instanceof Arrayable) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment