* [bug] use default menu in tutorial.
This commit is contained in:
@@ -622,7 +622,7 @@ class commonModel extends model
|
||||
|
||||
$menuOrder = array();
|
||||
$hasCustomMenu = false;
|
||||
if(isset($config->customMenu->nav) && !$useDefault)
|
||||
if(isset($config->customMenu->nav) && !$useDefault && !commonModel::isTutorialMode())
|
||||
{
|
||||
$items = json_decode($config->customMenu->nav);
|
||||
foreach($items as $item) $menuOrder[$item->order] = $item->name;
|
||||
|
||||
@@ -451,7 +451,7 @@ class customModel extends model
|
||||
|
||||
/* 获取自定义过的导航。 */
|
||||
$customKey = $isHomeMenu ? $app->tab . '-home' : ($module == 'main' ? $app->tab : $app->tab . '-' . $module);
|
||||
$customMenu = isset($config->customMenu->{$customKey}) ? $config->customMenu->{$customKey}: array();
|
||||
$customMenu = (isset($config->customMenu->{$customKey}) && !commonModel::isTutorialMode()) ? $config->customMenu->{$customKey}: array();
|
||||
|
||||
if(!empty($customMenu) && is_string($customMenu) && substr($customMenu, 0, 1) === '[') $customMenu = json_decode($customMenu);
|
||||
if($module == 'my' && empty($config->global->scoreStatus)) unset($allMenu->score);
|
||||
|
||||
Reference in New Issue
Block a user