From 60f4792c75a1c560fa50dd27a5d2e75a2ccf1762 Mon Sep 17 00:00:00 2001 From: Peter Szalatnay <85171715+peter1szalatnay@users.noreply.github.com> Date: Sun, 20 Oct 2024 20:55:46 +1100 Subject: [PATCH 1/2] Update Menu.php Fix an issues where xdebug always stop because asset is always missing from list, and it is just better then having @ for error handling. --- administrator/modules/mod_submenu/src/Menu/Menu.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/administrator/modules/mod_submenu/src/Menu/Menu.php b/administrator/modules/mod_submenu/src/Menu/Menu.php index d00d87a993162..08dca2333be8f 100644 --- a/administrator/modules/mod_submenu/src/Menu/Menu.php +++ b/administrator/modules/mod_submenu/src/Menu/Menu.php @@ -100,7 +100,9 @@ public static function preprocess($parent) // Exclude item with menu item option set to exclude from menu modules if ($itemParams->get('menu-permission')) { - @list($action, $asset) = explode(';', $itemParams->get('menu-permission')); + $parts = explode(';', $itemParams->get('menu-permission')); + $action = $parts[0]; + $asset = (\count($parts) > 1) ? $parts[1] : null; if (!$user->authorise($action, $asset)) { $parent->removeChild($item); From 2d2ddbcfd885b315743d3ffb885e83bf085f0762 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Wed, 23 Oct 2024 13:41:18 +0200 Subject: [PATCH 2/2] Update administrator/modules/mod_submenu/src/Menu/Menu.php Co-authored-by: Quy --- administrator/modules/mod_submenu/src/Menu/Menu.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/modules/mod_submenu/src/Menu/Menu.php b/administrator/modules/mod_submenu/src/Menu/Menu.php index 08dca2333be8f..54dc4abe936d6 100644 --- a/administrator/modules/mod_submenu/src/Menu/Menu.php +++ b/administrator/modules/mod_submenu/src/Menu/Menu.php @@ -102,7 +102,7 @@ public static function preprocess($parent) if ($itemParams->get('menu-permission')) { $parts = explode(';', $itemParams->get('menu-permission')); $action = $parts[0]; - $asset = (\count($parts) > 1) ? $parts[1] : null; + $asset = $parts[1] ?? null; if (!$user->authorise($action, $asset)) { $parent->removeChild($item);