Fix some broken menu items

Author: BurntimeX

com.woltlab.wcf/acpMenu.xml

@@ -137,5 +137,7 @@
 		<acpmenuitem name="wcf.acp.menu.link.log.exception"/>
 		<acpmenuitem name="wcf.acp.menu.link.log.authentication.failure"/>
 		<acpmenuitem name="wcf.acp.menu.link.log.modification"/>
+		<acpmenuitem name="wcf.acp.menu.link.content"/>
+		<acpmenuitem name="wcf.acp.menu.link.cms"/>
 	</delete>
 </data>

wcfsetup/install/files/lib/system/event/listener/AcpMenuItemCollectingListener.class.php

@@ -26,8 +26,8 @@ public function __invoke(ItemCollecting $event): void
         $this->addOptionItems($event);
         $this->addPackageItems($event);
         $this->addOtherItems($event);
-        $this->addDevtoolsItems($event);
         $this->addContactFormItems($event);
+        $this->addDevtoolsItems($event);
 
         $this->addUserItems($event);
         $this->addUserGroupItems($event);
@@ -97,7 +97,7 @@ private function addOptionItems(ItemCollecting $event): void
         ));
 
         foreach ((new TopOptionCategoryCache())->getCache() as $optionCategory) {
-            if (!$optionCategory->validateOptions() || $optionCategory->validatePermissions()) {
+            if (!$optionCategory->validateOptions() || !$optionCategory->validatePermissions()) {
                 continue;
             }
 
@@ -114,7 +114,7 @@ private function addOptionItems(ItemCollecting $event): void
         }
     }
 
-    private function addPackageItems(ItemCollecting $event): void
+    private function addOtherItems(ItemCollecting $event): void
     {
         $event->register(new AcpMenuItem(
             'wcf.acp.menu.link.other',
@@ -152,7 +152,7 @@ private function addPackageItems(ItemCollecting $event): void
         }
     }
 
-    private function addOtherItems(ItemCollecting $event): void
+    private function addPackageItems(ItemCollecting $event): void
     {
         $event->register(new AcpMenuItem(
             'wcf.acp.menu.link.package',
@@ -330,7 +330,10 @@ private function addUserItems(ItemCollecting $event): void
             $event->register(new AcpMenuItem(
                 'wcf.acp.menu.link.user.mail',
                 parentMenuItem: 'wcf.acp.menu.link.user.management',
-                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\UserMailForm::class)
+                link: LinkHandler::getInstance()->getControllerLink(
+                    \wcf\acp\form\UserMailForm::class,
+                    ['action' => 'all']
+                )
             ));
         }
         if (WCF::getSession()->getPermission('admin.user.canManageUserOption')) {
@@ -373,7 +376,10 @@ private function addUserGroupItems(ItemCollecting $event): void
             $event->register(new AcpMenuItem(
                 'wcf.acp.menu.link.group.mail',
                 parentMenuItem: 'wcf.acp.menu.link.group',
-                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\UserMailForm::class),
+                link: LinkHandler::getInstance()->getControllerLink(
+                    \wcf\acp\form\UserMailForm::class,
+                    ['action' => 'group']
+                ),
             ));
         }