From 54d16627d7bed8abd900e428e59bc962b04209c0 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Wed, 22 Jun 2016 15:41:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9Blang=E7=B1=BB=E7=9A=84detect?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/library/think/Lang.php b/library/think/Lang.php
index b049dc01..571921be 100644
--- a/library/think/Lang.php
+++ b/library/think/Lang.php
@@ -102,7 +102,7 @@ class Lang
     public static function has($name, $range = '')
     {
         $range = $range ?: self::$range;
-        return isset(self::$lang[$range][strtolower($name)]);        
+        return isset(self::$lang[$range][strtolower($name)]);
     }
 
     /**
@@ -169,7 +169,7 @@ class Lang
         }
         if (empty(self::$allowLangList) || in_array($langSet, self::$allowLangList)) {
             // 合法的语言
-            self::$range = $langSet;
+            self::$range = $langSet ?: self::$range;
         }
         return self::$range;
     }