From a21e43a452c15dddb070f621a858239eb82b4c57 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Tue, 21 Mar 2023 15:40:46 +0100 Subject: [PATCH] #10764 ignore selected action in fav menu --- pandora_console/include/functions_menu.php | 5 +++-- pandora_console/operation/menu.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index 1d567af5cc..f1a1b53108 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -253,6 +253,7 @@ function menu_print_menu(&$menu) if (($sec2 == $subsec2 || $allsec2 == $subsec2 || $selected_submenu2) && isset($sub[$subsec2]['options']) && (get_parameter_get($sub[$subsec2]['options']['name']) == $sub[$subsec2]['options']['value']) + && $main['id'] !== 'fav-menu' ) { // If the subclass is selected and there are options and that options value is true. $class .= 'submenu_selected selected'; @@ -260,7 +261,7 @@ function menu_print_menu(&$menu) $menu2_selected = $sub['id']; $selected = true; $visible = true; - } else if (($sec2 === $subsec2 || $allsec2 === $subsec2 || $selected_submenu2 === true) && isset($sub[$subsec2]['options']) === false) { + } else if (($sec2 === $subsec2 || $allsec2 === $subsec2 || $selected_submenu2 === true) && isset($sub[$subsec2]['options']) === false && $main['id'] !== 'fav-menu') { $class .= 'submenu_selected selected'; $selected = true; $menu_selected = true; @@ -382,7 +383,7 @@ function menu_print_menu(&$menu) $class = 'sub_subMenu'; - if ($key == $sec2) { + if ($key == $sec2 && $main['id'] !== 'fav-menu') { $class .= ' selected'; } diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index b9e2d2d714..e2325535ce 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -632,7 +632,7 @@ if ($favorite_menu !== false) { $sub[$section]['text'] = __(str_replace('_', ' ', $section)); $sub[$section]['type'] = 'direct'; $sub[$section]['subtype'] = 'nolink'; - $sub[$section]['id'] = $row['section']; + $sub[$section]['id'] = $row['section'].'-fav-menu'; $sub2[$row['url']]['text'] = io_safe_output($row['label']); $sub[$section]['sub2'] = $sub2;