From 73189bda4bb1835cc3e03e4ab2995494b72b36da Mon Sep 17 00:00:00 2001
From: huangdijia <huangdijia@gmail.com>
Date: Mon, 28 Dec 2015 08:50:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=A4=E4=B8=AA=E5=9B=A0cl?=
 =?UTF-8?q?i=E6=A8=A1=E5=BC=8F=E4=B8=8B=E5=9B=A0REQUEST=5FMETHOD=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E5=AF=BC=E8=87=B4=E7=9A=84notic=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/lang.php  | 1 +
 library/think/route.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/think/lang.php b/library/think/lang.php
index afb3547a..061589fd 100644
--- a/library/think/lang.php
+++ b/library/think/lang.php
@@ -112,6 +112,7 @@ class Lang
         // 自动侦测设置获取语言选择
         $langCookieVar = Config::get('lang_cookie_var');
         $langDetectVar = Config::get('lang_detect_var');
+        $langSet       = '';
         if (isset($_GET[$langDetectVar])) {
             // url中设置了语言变量
             $langSet = strtolower($_GET[$langDetectVar]);
diff --git a/library/think/route.php b/library/think/route.php
index 4bf7b327..45834d28 100644
--- a/library/think/route.php
+++ b/library/think/route.php
@@ -237,11 +237,11 @@ class Route
         }
 
         // 获取当前请求类型的路由规则
-        $rules = self::$rules[REQUEST_METHOD];
+        $rules = isset(self::$rules[REQUEST_METHOD]) ? self::$rules[REQUEST_METHOD] : [];
 
         if (!empty(self::$rules['*'])) {
             // 合并任意请求的路由规则
-            $rules = array_merge(self::$rules['*'], $rules);
+            $rules = array_merge(self::$rules['*'], (array) $rules);
         }
         // 路由规则检测
         if (!empty($rules)) {