mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 07:12:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

修正两个因cli模式下因REQUEST_METHOD为空导致的notic错误

Browse Source
This commit is contained in:
huangdijia
2015-12-28 08:50:50 +08:00
parent accc680e4b
commit 73189bda4b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
library/think/lang.php
View File

@@ -112,6 +112,7 @@ class Lang
// 自动侦测设置获取语言选择 // 自动侦测设置获取语言选择
$langCookieVar = Config::get('lang_cookie_var'); $langCookieVar = Config::get('lang_cookie_var');
$langDetectVar = Config::get('lang_detect_var'); $langDetectVar = Config::get('lang_detect_var');
$langSet = '';
if (isset($_GET[$langDetectVar])) { if (isset($_GET[$langDetectVar])) {
// url中设置了语言变量 // url中设置了语言变量
$langSet = strtolower($_GET[$langDetectVar]); $langSet = strtolower($_GET[$langDetectVar]);

4
library/think/route.php
View File

@@ -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['*'])) { if (!empty(self::$rules['*'])) {
// 合并任意请求的路由规则 // 合并任意请求的路由规则
$rules = array_merge(self::$rules['*'], $rules); $rules = array_merge(self::$rules['*'], (array) $rules);
} }
// 路由规则检测 // 路由规则检测
if (!empty($rules)) { if (!empty($rules)) {