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

修改当开启多语言模块时，定义的语言包中，语言的键值为纯数字时，在加载语言文件时使用array_merge合并多个语言包时，会自动将数字的键值替换为默认索引值的bug

Browse Source
This commit is contained in:
xiaobo.sun
2016-01-28 17:43:15 +08:00
committed by 7IN0SAN9
parent 635182dda2
commit 8fa28f2097
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/Lang.php
View File

@@ -43,7 +43,7 @@ class Lang
self::$lang[$range] = [];
}
if (is_array($name)) {
return self::$lang[$range] = array_merge(self::$lang[$range], array_change_key_case($name));
return self::$lang[$range] = array_change_key_case($name) + self::$lang[$range];
} else {
return self::$lang[$range][strtolower($name)] = $value;
}
@@ -70,10 +70,10 @@ class Lang
// 记录加载信息
APP_DEBUG && Log::record('[ LANG ] ' . $file, 'info');
$_lang = is_file($_file) ? include $_file : [];
$lang = array_merge($lang, array_change_key_case($_lang));
$lang = array_change_key_case($_lang) + $lang;
}
if (!empty($lang)) {
self::$lang[$range] = array_merge(self::$lang[$range], $lang);
self::$lang[$range] = $lang + self::$lang[$range];
}
return self::$lang[$range];
}