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

加载配置文件的时候，如果有二维配置参数的时候 支持合并

Browse Source
This commit is contained in:
thinkphp
2016-02-01 11:40:29 +08:00
parent 6157940c8d
commit 051aa149b0
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
library/think/Config.php
View File

@@ -142,10 +142,14 @@ class Config
return; return;
} elseif (is_array($name)) { } elseif (is_array($name)) {
// 批量设置 // 批量设置
$config = array_change_key_case($name);
if (!empty($value)) { if (!empty($value)) {
return self::$config[$range][$value] = array_change_key_case($name); self::$config[$range][$value] = isset(self::$config[$range][$value]) ?
array_merge(self::$config[$range][$value], $config) :
self::$config[$range][$value] = $config;
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], $config);
} }
} else { } else {
// 为空直接返回 已有配置 // 为空直接返回 已有配置
@@ -158,7 +162,7 @@ class Config
*/ */
public static function reset($range = '') public static function reset($range = '')
{ {
$range = $range ?: self::$range; $range = $range ?: self::$range;
true === $range ? self::$config = [] : self::$config[$range] = []; true === $range ? self::$config = [] : self::$config[$range] = [];
} }
} }