topnuomi
/
TOP-framework
mirror of https://gitee.com/topnuomi/TOP-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复配置为数字索引时merge操作会重置配置名称的问题

This commit is contained in:
TOP糯米 2020-05-30 01:34:32 +08:00
parent 5aae122b38
commit 73fd8c9941
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/library/Config.php
View File

@ -61,7 +61,9 @@ class Config
// 合并配置项 // 合并配置项
foreach ($config as $key => $value) { foreach ($config as $key => $value) {
if (array_key_exists($key, $this->config) && is_array($value)) { if (array_key_exists($key, $this->config) && is_array($value)) {
$this->config[$key] = array_merge($this->config[$key], $value); foreach ($value as $k => $v) {
$this->config[$key][$k] = $v;
}
} else { } else {
$this->config[$key] = $value; $this->config[$key] = $value;
} }