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

改进Config类的set方法

Browse Source
This commit is contained in:
thinkphp
2015-11-24 22:44:51 +08:00
parent b1c3fe5e9c
commit f6e3ec30a5
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
library/think/config.php
View File

@@ -14,9 +14,9 @@ namespace think;
class Config
{
// 配置参数
private static $config = [];
private static $config = [];
// 参数作用域
private static $range = '_sys_';
private static $range = '_sys_';
// 设定配置参数的作用域
public static function range($range)
@@ -35,9 +35,9 @@ class Config
}
// 加载配置文件
public static function load($file, $range = '')
public static function load($file, $name = '', $range = '')
{
return self::set(include $file, '', $range);
return self::set(include $file, $name, $range);
}
// 检测配置是否存在
@@ -100,8 +100,11 @@ class Config
return;
} elseif (is_array($name)) {
// 批量设置
self::$config[$range] = array_merge(self::$config[$range], array_change_key_case($name));
return self::$config[$range];
if (!empty($value)) {
return self::$config[$range][$value] = array_change_key_case($name);
} else {
return self::$config[$range] = array_merge(self::$config[$range], array_change_key_case($name));
}
} else {
return null; // 避免非法参数
}