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

Merge branch 'master' of https://github.com/top-think/framework

Browse Source
This commit is contained in:
thinkphp
2017-08-28 11:30:42 +08:00
parent 6e75d3c6c7 9e86f2877a
commit 64ccd7ea68
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/think/Config.php
View File

@@ -152,8 +152,7 @@ class Config
// 批量设置 // 批量设置
if (!empty($value)) { if (!empty($value)) {
self::$config[$range][$value] = isset(self::$config[$range][$value]) ? self::$config[$range][$value] = isset(self::$config[$range][$value]) ?
array_merge(self::$config[$range][$value], $name) : array_merge(self::$config[$range][$value], $name) : $name;
self::$config[$range][$value] = $name;
return self::$config[$range][$value]; return self::$config[$range][$value];
} else { } else {
return self::$config[$range] = array_merge(self::$config[$range], array_change_key_case($name)); return self::$config[$range] = array_merge(self::$config[$range], array_change_key_case($name));