From f96e5ccc21be440b074aa56eac0b378043e9c44d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=92=8B=E6=96=87=E5=81=A5?= <jwjbjg@gmail.com>
Date: Tue, 8 Aug 2017 13:16:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=85=88=E4=BD=BF=E7=94=A8Cookie?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E8=AF=AD=E8=A8=80=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

多语言自动切换时，优先使用COOKIE中的语言设置，方便保持用户自己选择的语言。
---
 library/think/Lang.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/think/Lang.php b/library/think/Lang.php
index fde811cd..a4404f1e 100644
--- a/library/think/Lang.php
+++ b/library/think/Lang.php
@@ -160,6 +160,9 @@ class Lang
         if (isset($_GET[self::$langDetectVar])) {
             // url中设置了语言变量
             $langSet = strtolower($_GET[self::$langDetectVar]);
+        } elseif (isset($_COOKIE[self::$langCookieVar])) {
+            // Cookie中设置了语言变量
+            $langSet = strtolower($_COOKIE[self::$langCookieVar]);
         } elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
             // 自动侦测浏览器语言
             preg_match('/^([a-z\d\-]+)/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches);