Fixed current menu item not being marked if the current URL contained…

… a query string
projectsend · Jan 10, 2022 · 863171e · 863171e
1 parent 0e715ae
commit 863171e
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/includes/main-menu.php b/includes/main-menu.php
@@ -345,8 +345,7 @@
 /**
  * Build the menu
  */
-$current_filename = basename($_SERVER['REQUEST_URI']);
-
+$current_filename = parse_url(basename($_SERVER['REQUEST_URI']));
 $menu_output = "
     <div class='main_side_menu'>
         <ul class='main_menu' role='menu'>\n";
@@ -388,7 +387,7 @@
 				}
 				else
 				{
-					$sub_active		= ( $subitem['link'] == $current_filename ) ? 'current_page' : '';
+					$sub_active		= ( $subitem['link'] == $current_filename['path'] ) ? 'current_page' : '';
 					$format			= "\t\t<li class='%s'>\n\t\t\t<a href='%s'>%s<span class='submenu_label'>%s%s</span></a>\n\t\t</li>\n";
 					$menu_output 	.= sprintf( $format, $sub_active, BASE_URI . $subitem['link'], $icon, $subitem['label'], $badge );
 				}