Mirrors/yii2
2
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2026-03-13 18:58:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #11549: Fixed ArrayHelper::getValue() to work properly with float keys

Browse Source
This commit is contained in:
wanghui
2016-05-12 11:25:09 +08:00
committed by Alexander Makarov
parent b45e5fbaf2
commit 01c84e2ff2
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/helpers/BaseArrayHelper.php
View File

@@ -189,7 +189,7 @@ class BaseArrayHelper
$key = $lastKey;
}
if (is_array($array) && array_key_exists($key, $array)) {
if (is_array($array) && (isset($array[$key]) || array_key_exists($key, $array)) ) {
return $array[$key];
}
@@ -203,7 +203,7 @@ class BaseArrayHelper
// it is not reliably possible to check whether a property is accessable beforehand
return $array->$key;
} elseif (is_array($array)) {
return array_key_exists($key, $array) ? $array[$key] : $default;
return (isset($array[$key]) || array_key_exists($key, $array)) ? $array[$key] : $default;
} else {
return $default;
}