hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "" 

This reverts commit 94e7615dec.
pull/269678/MERGE
Karson 2017-04-20 19:56:08 +08:00
parent 94e7615dec
commit 0b13e1efe3
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/admin/library/Auth.php
View File

@ -219,7 +219,7 @@ class Auth extends \fast\Auth
{ {
if (stripos($k, '/') === false) if (stripos($k, '/') === false)
{ {
$url = '/' . $this->request->module() . '/' . $k; $url = '/admin/' . $k;
} }
else else
{ {
@ -250,7 +250,6 @@ class Auth extends \fast\Auth
$select_id = 0; $select_id = 0;
$dashboard = rtrim(url('dashboard/'), '/'); $dashboard = rtrim(url('dashboard/'), '/');
$dashboard = stripos($dashboard, 'index.php') !== FALSE ? substr($dashboard, stripos($dashboard, 'index.php') + 9) : $dashboard;
// 必须将结果集转换为数组 // 必须将结果集转换为数组
$ruleList = collection(model('AuthRule')->where('ismenu', 1)->order('weigh', 'desc')->cache("__menu__")->select())->toArray(); $ruleList = collection(model('AuthRule')->where('ismenu', 1)->order('weigh', 'desc')->cache("__menu__")->select())->toArray();
foreach ($ruleList as $k => &$v) foreach ($ruleList as $k => &$v)