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

Config类load方法调整 必须给出完整路径

Browse Source
This commit is contained in:
thinkphp
2016-01-20 20:36:40 +08:00
parent b38d71e344
commit 411df30e57
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/App.php
View File

@@ -34,7 +34,7 @@ class App
// 读取扩展配置文件 // 读取扩展配置文件
if (Config::get('extra_config_list')) { if (Config::get('extra_config_list')) {
foreach (Config::get('extra_config_list') as $file) { foreach (Config::get('extra_config_list') as $file) {
Config::load($file, $file); Config::load(APP_PATH . $file . EXT, $file);
} }
} }
@@ -287,11 +287,11 @@ class App
} else { } else {
$path = APP_PATH . $module; $path = APP_PATH . $module;
// 加载模块配置 // 加载模块配置
Config::load($module . 'config'); Config::load(APP_PATH . $module . 'config' . EXT);
// 加载应用状态配置 // 加载应用状态配置
if ($config['app_status']) { if ($config['app_status']) {
Config::load($module . $config['app_status']); Config::load(APP_PATH . $module . $config['app_status'] . EXT);
} }
// 加载别名文件 // 加载别名文件

1
library/think/Config.php
View File

@@ -55,7 +55,6 @@ class Config
public static function load($file, $name = '', $range = '') public static function load($file, $name = '', $range = '')
{ {
$range = $range ?: self::$range; $range = $range ?: self::$range;
$file = strpos($file, '.') ? $file : APP_PATH . $file . EXT;
if (!isset(self::$config[$range])) { if (!isset(self::$config[$range])) {
self::$config[$range] = []; self::$config[$range] = [];
} }

4
tests/thinkphp/library/think/configTest.php
View File

@@ -46,8 +46,8 @@ class configTest extends \PHPUnit_Framework_TestCase
public function testLoad() public function testLoad()
{ {
$file = 'config'; $file = include APP_PATH . 'config' . EXT;
$config = array_change_key_case(include APP_PATH . $file . EXT); $config = array_change_key_case(include $file);
$name = '_name_'; $name = '_name_';
$range = '_test_'; $range = '_test_';