molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

内核更新

Browse Source
This commit is contained in:
molong
2016-09-01 22:03:02 +08:00
parent a12aba3512
commit 7381ce5ce7
15 changed files with 83 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/library/think/Config.php
View File

@@ -81,20 +81,10 @@ class Config
$range = $range ?: self::$range;
if (!strpos($name, '.')) {
// 判断环境变量
$result = getenv(ENV_PREFIX . strtoupper($name));
if (false !== $result) {
return $result;
}
return isset(self::$config[$range][strtolower($name)]);
} else {
// 二维数组设置和获取支持
$name = explode('.', $name);
$result = getenv(ENV_PREFIX . strtoupper($name[0] . '_' . $name[1]));
// 判断环境变量
if (false !== $result) {
return $result;
}
$name = explode('.', $name);
return isset(self::$config[$range][strtolower($name[0])][$name[1]]);
}
}
@@ -114,20 +104,11 @@ class Config
}
if (!strpos($name, '.')) {
$result = getenv(ENV_PREFIX . strtoupper($name));
if (false !== $result) {
return $result;
}
$name = strtolower($name);
return isset(self::$config[$range][$name]) ? self::$config[$range][$name] : null;
} else {
// 二维数组设置和获取支持
$name = explode('.', $name);
$result = getenv(ENV_PREFIX . strtoupper($name[0] . '_' . $name[1]));
// 判断环境变量
if (false !== $result) {
return $result;
}
$name = explode('.', $name);
$name[0] = strtolower($name[0]);
return isset(self::$config[$range][$name[0]][$name[1]]) ? self::$config[$range][$name[0]][$name[1]] : null;
}