修复菜单无法通过命令行删除的BUG
修复语言标识可能导致的XSS的BUG 修复路由未对admin模块失效的BUG
正在显示
4 个修改的文件
包含
4 行增加
和
5 行删除
@@ -31,7 +31,6 @@ class Menu extends Command | @@ -31,7 +31,6 @@ class Menu extends Command | ||
31 | { | 31 | { |
32 | $this->model = new AuthRule(); | 32 | $this->model = new AuthRule(); |
33 | $adminPath = dirname(__DIR__) . DS; | 33 | $adminPath = dirname(__DIR__) . DS; |
34 | - $moduleName = 'admin'; | ||
35 | //控制器名 | 34 | //控制器名 |
36 | $controller = $input->getOption('controller') ?: ''; | 35 | $controller = $input->getOption('controller') ?: ''; |
37 | if (!$controller) | 36 | if (!$controller) |
@@ -47,7 +46,7 @@ class Menu extends Command | @@ -47,7 +46,7 @@ class Menu extends Command | ||
47 | throw new Exception("could not delete all menu"); | 46 | throw new Exception("could not delete all menu"); |
48 | } | 47 | } |
49 | $ids = []; | 48 | $ids = []; |
50 | - $list = $this->model->where('name', 'like', "/{$moduleName}/" . strtolower($controller) . "%")->select(); | 49 | + $list = $this->model->where('name', 'like', strtolower($controller) . "%")->select(); |
51 | foreach ($list as $k => $v) | 50 | foreach ($list as $k => $v) |
52 | { | 51 | { |
53 | $output->warning($v->name); | 52 | $output->warning($v->name); |
@@ -135,7 +135,7 @@ class Backend extends Controller | @@ -135,7 +135,7 @@ class Backend extends Controller | ||
135 | } | 135 | } |
136 | 136 | ||
137 | // 语言检测 | 137 | // 语言检测 |
138 | - $lang = Lang::detect(); | 138 | + $lang = strip_tags(Lang::detect()); |
139 | 139 | ||
140 | $site = Config::get("site"); | 140 | $site = Config::get("site"); |
141 | 141 |
@@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
11 | // +---------------------------------------------------------------------- | 11 | // +---------------------------------------------------------------------- |
12 | 12 | ||
13 | //如果有定义绑定后台模块则禁用路由规则 | 13 | //如果有定义绑定后台模块则禁用路由规则 |
14 | -if (defined('BIND_MODULE') && BIND_MODULE == 'admin') | 14 | +if (\think\Route::getBind('module') == 'admin') |
15 | return []; | 15 | return []; |
16 | 16 | ||
17 | return [ | 17 | return [ |
-
请 注册 或 登录 后发表评论