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

改进config和lang类的文件加载信息日志记录

Browse Source
This commit is contained in:
thinkphp
2016-04-06 15:34:41 +08:00
parent 644adf60be
commit 164b73f0c3
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
library/think/Config.php
View File

@@ -56,9 +56,13 @@ class Config
if (!isset(self::$config[$range])) { if (!isset(self::$config[$range])) {
self::$config[$range] = []; self::$config[$range] = [];
} }
// 记录加载信息 if (is_file($file)) {
APP_DEBUG && Log::record('[ CONFIG ] ' . $file, 'info'); // 记录加载信息
return is_file($file) ? self::set(include $file, $name, $range) : self::$config[$range]; APP_DEBUG && Log::record('[ CONFIG ] ' . $file, 'info');
return self::set(include $file, $name, $range);
} else {
return self::$config[$range];
}
} }
/** /**

12
library/think/Lang.php
View File

@@ -67,10 +67,14 @@ class Lang
} }
$lang = []; $lang = [];
foreach ($file as $_file) { foreach ($file as $_file) {
// 记录加载信息 if (is_file($_file)) {
APP_DEBUG && Log::record('[ LANG ] ' . $_file, 'info'); // 记录加载信息
$_lang = is_file($_file) ? include $_file : []; APP_DEBUG && Log::record('[ LANG ] ' . $_file, 'info');
$lang = array_change_key_case($_lang) + $lang; $_lang = include $_file;
} else {
$_lang = [];
}
$lang = array_change_key_case($_lang) + $lang;
} }
if (!empty($lang)) { if (!empty($lang)) {
self::$lang[$range] = $lang + self::$lang[$range]; self::$lang[$range] = $lang + self::$lang[$range];