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

Revert "#9915: changed behavior of ArrayHelper::getValue() according to @azureru suggestion"

Browse Source 
This reverts commit 4b511fb9bcbb1fc5838ad8bc65f3852b09287acb.
This commit is contained in:
SilverFire - Dmitry Naumenko
2016-01-15 16:03:46 +02:00
parent 4b511fb9bc
commit f72e9d5bcf
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/helpers/BaseArrayHelper.php
View File

@ -198,7 +198,7 @@ class BaseArrayHelper
$key = substr($key, $pos + 1); $key = substr($key, $pos + 1);
} }
if (is_object($array) && property_exists($array, $key)) { if (is_object($array) && isset($array->$key)) {
return $array->$key; return $array->$key;
} elseif (is_array($array)) { } elseif (is_array($array)) {
return array_key_exists($key, $array) ? $array[$key] : $default; return array_key_exists($key, $array) ? $array[$key] : $default;