From 8fa28f20977fa4a9f96ad348b1d9ed9f83e24269 Mon Sep 17 00:00:00 2001
From: "xiaobo.sun" <xiaobosun@gridinfo.com.cn>
Date: Thu, 28 Jan 2016 17:43:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=93=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=A8=A1=E5=9D=97=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=9A=84=E8=AF=AD=E8=A8=80=E5=8C=85=E4=B8=AD?=
 =?UTF-8?q?=EF=BC=8C=E8=AF=AD=E8=A8=80=E7=9A=84=E9=94=AE=E5=80=BC=E4=B8=BA?=
 =?UTF-8?q?=E7=BA=AF=E6=95=B0=E5=AD=97=E6=97=B6=EF=BC=8C=E5=9C=A8=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E8=AF=AD=E8=A8=80=E6=96=87=E4=BB=B6=E6=97=B6=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8array=5Fmerge=E5=90=88=E5=B9=B6=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E8=AF=AD=E8=A8=80=E5=8C=85=E6=97=B6=EF=BC=8C=E4=BC=9A=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=B0=86=E6=95=B0=E5=AD=97=E7=9A=84=E9=94=AE=E5=80=BC?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=BA=E9=BB=98=E8=AE=A4=E7=B4=A2=E5=BC=95?=
 =?UTF-8?q?=E5=80=BC=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Lang.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/think/Lang.php b/library/think/Lang.php
index 54db3fc8..5f145c9d 100644
--- a/library/think/Lang.php
+++ b/library/think/Lang.php
@@ -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];
     }