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

修正config类的set方法返回值问题

Browse Source
This commit is contained in:
thinkphp
2015-12-08 23:53:36 +08:00
parent 386228958b
commit e1276159b2
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
library/think/config.php
View File

@@ -22,6 +22,9 @@ class Config
public static function range($range)
{
self::$range = $range;
if (!isset(self::$config[$range])) {
self::$config[$range] = [];
}
}
// 解析其他格式的配置参数
@@ -38,6 +41,9 @@ class Config
public static function load($file, $name = '', $range = '')
{
$file = strpos($file, '.') ? $file : APP_PATH . $file . EXT;
if (!isset(self::$config[$range])) {
self::$config[$range] = [];
}
return is_file($file) ? self::set(include $file, $name, $range) : self::$config[$range];
}
@@ -107,7 +113,8 @@ class Config
return self::$config[$range] = array_merge(self::$config[$range], array_change_key_case($name));
}
} else {
return null; // 避免非法参数
// 为空直接返回 已有配置
return self::$config[$range];
}
}