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 
语言定义批量加载BUG
This commit is contained in:
pwf0112
2015-12-20 09:13:29 +08:00
parent e0bea45df4
commit 16e5bed127
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
library/think/lang.php
View File

@@ -60,16 +60,20 @@ class Lang
public static function load($file, $range = '') public static function load($file, $range = '')
{ {
$range = $range ?: self::$range; $range = $range ?: self::$range;
$lang = is_file($file) ? include $file : [];
if (!isset(self::$lang[$range])) { if (!isset(self::$lang[$range])) {
self::$lang[$range] = []; self::$lang[$range] = [];
} }
// 批量定义 // 批量定义
if (!isset(self::$lang[$range])) { + if (is_string($file)) {
self::$lang[$range] = []; + $file = [$file];
} + }
+ $lang = [];
+ foreach ($file as $_file) {
+ $_lang = is_file($_file) ? include $_file : [];
+ $lang = array_merge($lang, array_change_key_case($_lang));
}
if (!empty($lang)) { if (!empty($lang)) {
self::$lang[$range] = array_merge(self::$lang[$range], array_change_key_case($lang)); self::$lang[$range] = array_merge(self::$lang[$range], $lang);
} }
return self::$lang[$range]; return self::$lang[$range];
} }