From f72e9d5bcf4642a0fe54ccbc3bd58d7e05e3ff7b Mon Sep 17 00:00:00 2001 From: SilverFire - Dmitry Naumenko Date: Fri, 15 Jan 2016 16:03:46 +0200 Subject: [PATCH] Revert "#9915: changed behavior of ArrayHelper::getValue() according to @azureru suggestion" This reverts commit 4b511fb9bcbb1fc5838ad8bc65f3852b09287acb. --- framework/helpers/BaseArrayHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/helpers/BaseArrayHelper.php b/framework/helpers/BaseArrayHelper.php index d74485de09..037192fa5a 100644 --- a/framework/helpers/BaseArrayHelper.php +++ b/framework/helpers/BaseArrayHelper.php @@ -198,7 +198,7 @@ class BaseArrayHelper $key = substr($key, $pos + 1); } - if (is_object($array) && property_exists($array, $key)) { + if (is_object($array) && isset($array->$key)) { return $array->$key; } elseif (is_array($array)) { return array_key_exists($key, $array) ? $array[$key] : $default;