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

修正警告错误

Browse Source
This commit is contained in:
thinkphp
2015-12-08 17:56:35 +08:00
parent ea6a67b5d5
commit e153f7f074
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
convention.php
View File

@@ -46,6 +46,8 @@ return [
'action_bind_class' => false, 'action_bind_class' => false,
'url_module_map' => [], 'url_module_map' => [],
'response_exit' => true, 'response_exit' => true,
'default_lang' => 'zh-cn',
'use_session' => false,
/* 错误设置 */ /* 错误设置 */
//错误显示信息,非调试模式有效 //错误显示信息,非调试模式有效

6
library/think/lang.php
View File

@@ -35,6 +35,9 @@ class Lang
{ {
$range = $range ? $range : self::$range; $range = $range ? $range : self::$range;
// 批量定义 // 批量定义
if (!isset(self::$lang[$range])) {
self::$lang[$range] = [];
}
if (is_array($name)) { if (is_array($name)) {
return self::$lang[$range] = array_merge(self::$lang[$range], array_change_key_case($name)); return self::$lang[$range] = array_merge(self::$lang[$range], array_change_key_case($name));
} else { } else {
@@ -52,6 +55,9 @@ class Lang
{ {
$range = $range ? $range : self::$range; $range = $range ? $range : self::$range;
$lang = is_file($file) ? include $file : []; $lang = is_file($file) ? include $file : [];
if (!isset(self::$lang[$range])) {
self::$lang[$range] = [];
}
// 批量定义 // 批量定义
return self::$lang[$range] = array_merge(self::$lang[$range], array_change_key_case($lang)); return self::$lang[$range] = array_merge(self::$lang[$range], array_change_key_case($lang));
} }