mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

修正config类一处bug

Browse Source
This commit is contained in:
thinkphp
2016-03-14 17:24:00 +08:00
parent 2e17f418eb
commit 49fe92dc56
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/think/Config.php
View File

@@ -142,14 +142,13 @@ class Config
return;
} elseif (is_array($name)) {
// 批量设置
$config = array_change_key_case($name);
if (!empty($value)) {
self::$config[$range][$value] = isset(self::$config[$range][$value]) ?
array_merge(self::$config[$range][$value], $config) :
self::$config[$range][$value] = $config;
array_merge(self::$config[$range][$value], $name) :
self::$config[$range][$value] = $name;
return self::$config[$range][$value];
} else {
return self::$config[$range] = array_merge(self::$config[$range], $config);
return self::$config[$range] = array_merge(self::$config[$range], array_change_key_case($name));
}
} else {
// 为空直接返回 已有配置