From: Marcel Werk Date: Fri, 1 Mar 2024 17:17:40 +0000 (+0100) Subject: Fix obsolete 'caret-down' icon in menus X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=701d36288bae3d28286036445f7995ded6b7828c;p=GitHub%2FWoltLab%2FWCF.git Fix obsolete 'caret-down' icon in menus The icon was incorrectly shown in all menus and all levels. --- diff --git a/com.woltlab.wcf/templates/__menu.tpl b/com.woltlab.wcf/templates/__menu.tpl index b82a58d234..a5d2b70b02 100644 --- a/com.woltlab.wcf/templates/__menu.tpl +++ b/com.woltlab.wcf/templates/__menu.tpl @@ -9,7 +9,7 @@ {if $menuItemNode->getOutstandingItems() > 0} {#$menuItemNode->getOutstandingItems()} {/if} - {if $menuItemNode->hasChildren()} + {if $menuIdentifier == 'com.woltlab.wcf.MainMenu' && $menuItemNode->hasChildren() && $menuItemNode->getDepth() == 1} {icon name='caret-down' type='solid'} {/if} diff --git a/wcfsetup/install/files/lib/data/menu/Menu.class.php b/wcfsetup/install/files/lib/data/menu/Menu.class.php index d6fddbd973..05a94d707b 100644 --- a/wcfsetup/install/files/lib/data/menu/Menu.class.php +++ b/wcfsetup/install/files/lib/data/menu/Menu.class.php @@ -89,6 +89,7 @@ class Menu extends DatabaseObject implements ITitledObject WCF::getTPL()->assign([ 'menuItemNodeList' => $this->getMenuItemNodeList(), 'menuTitle' => $this->getTitle(), + 'menuIdentifier' => $this->identifier, ]); return WCF::getTPL()->fetch('__menu');