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)) {