Change ACP edit forms' active menu item to list menu item

… and do the same for some non-edit forms, too.

See #2816

diff --git a/wcfsetup/install/files/lib/acp/form/AdEditForm.class.php b/wcfsetup/install/files/lib/acp/form/AdEditForm.class.php
index 9a8028c280a842b4b5b6c24506a20912abdfb396..ddd4335a7bc5d762e0bfadad8ea35f6681359e3e 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/AdEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/AdEditForm.class.php
@@ -19,7 +19,7 @@ class AdEditForm extends AdAddForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.ad';
+       public $activeMenuItem = 'wcf.acp.menu.link.ad.list';
        
        /**
         * id of the edited ad

diff --git a/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php b/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php
index f314fc52e5c85cede8c0fb48e14c9c05db73013b..9870340a692ee9240426cb86fa70f5aee7cbfc38 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php
@@ -29,7 +29,7 @@ class ApplicationEditForm extends AbstractForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.package';
+       public $activeMenuItem = 'wcf.acp.menu.link.application.management';
        
        /**
         * viewable application object

diff --git a/wcfsetup/install/files/lib/acp/form/BBCodeEditForm.class.php b/wcfsetup/install/files/lib/acp/form/BBCodeEditForm.class.php
index e4abff3b1e53ad4433c970ff37efe8f1a343d1fb..b0e5fda2d0ea509149b06c4a4ef113297a93627d 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/BBCodeEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/BBCodeEditForm.class.php
@@ -21,7 +21,7 @@ class BBCodeEditForm extends BBCodeAddForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.bbcode';
+       public $activeMenuItem = 'wcf.acp.menu.link.bbcode.list';
        
        /**
         * @inheritDoc

diff --git a/wcfsetup/install/files/lib/acp/form/BBCodeMediaProviderEditForm.class.php b/wcfsetup/install/files/lib/acp/form/BBCodeMediaProviderEditForm.class.php
index b105cad9e09e8e5bce3e63014a765ada328a28b8..2115522ba2e1b060b8db33108b8e9b5cabdd680b 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/BBCodeMediaProviderEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/BBCodeMediaProviderEditForm.class.php
@@ -18,7 +18,7 @@ class BBCodeMediaProviderEditForm extends BBCodeMediaProviderAddForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.bbcode';
+       public $activeMenuItem = 'wcf.acp.menu.link.bbcode.list';
        
        /**
         * @inheritDoc

diff --git a/wcfsetup/install/files/lib/acp/form/CaptchaQuestionEditForm.class.php b/wcfsetup/install/files/lib/acp/form/CaptchaQuestionEditForm.class.php
index fd9186a83e91af131c75a17ee3ac62cc9ce4e9b0..5ad3544847d63b7dfa19142707e207df764286e8 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/CaptchaQuestionEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/CaptchaQuestionEditForm.class.php
@@ -19,7 +19,7 @@ class CaptchaQuestionEditForm extends CaptchaQuestionAddForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.other';
+       public $activeMenuItem = 'wcf.acp.menu.link.captcha.question.list';
        
        /**
         * edited captcha question

diff --git a/wcfsetup/install/files/lib/acp/form/CronjobEditForm.class.php b/wcfsetup/install/files/lib/acp/form/CronjobEditForm.class.php
index 6248bc9b42f4f23519b1c38451588ba2cff215aa..942859adca073dec8e02dc5cf28bfab4dd6340ef 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/form/CronjobEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/CronjobEditForm.class.php
@@ -19,7 +19,7 @@ class CronjobEditForm extends CronjobAddForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.maintenance';
+       public $activeMenuItem = 'wcf.acp.menu.link.cronjob.list';
        
        /**
         * cronjob id

diff --git a/wcfsetup/install/files/lib/acp/form/LabelEditForm.class.php b/wcfsetup/install/files/lib/acp/form/LabelEditForm.class.php
index 06529bdf8a8637c687cda952d2743fd1bc01215a..d11297f8d3c249dcc0cfe55750ae9dcaf9a89f49 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/LabelEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LabelEditForm.class.php
@@ -20,7 +20,7 @@ class LabelEditForm extends LabelAddForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.label';
+       public $activeMenuItem = 'wcf.acp.menu.link.label.list';
        
        /**
         * @inheritDoc

diff --git a/wcfsetup/install/files/lib/acp/form/LabelGroupEditForm.class.php b/wcfsetup/install/files/lib/acp/form/LabelGroupEditForm.class.php
index 4354108787bb64e6ba3554e1dc90fd62b6caa013..f74ea9362aaa67cbfa7bbfb6b77c6f793eb392f9 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/LabelGroupEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LabelGroupEditForm.class.php
@@ -20,7 +20,7 @@ class LabelGroupEditForm extends LabelGroupAddForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.label';
+       public $activeMenuItem = 'wcf.acp.menu.link.label.group.list';
        
        /**
         * @inheritDoc

diff --git a/wcfsetup/install/files/lib/acp/form/LanguageAddForm.class.php b/wcfsetup/install/files/lib/acp/form/LanguageAddForm.class.php
index 1f03d3326912715cba48416536324b2f7b00e695..23ce09b1a0954c08947eb16b52f15b354cbfdc2b 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/LanguageAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LanguageAddForm.class.php
@@ -20,7 +20,7 @@ class LanguageAddForm extends AbstractForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.language';
+       public $activeMenuItem = 'wcf.acp.menu.link.language.list';
        
        /**
         * country code

diff --git a/wcfsetup/install/files/lib/acp/form/LanguageExportForm.class.php b/wcfsetup/install/files/lib/acp/form/LanguageExportForm.class.php
index 6b2a5ec29a042833fd64fa9a322d9190371f2029..b298f3b1601df293aa31ddb9df870da08c780ce7 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/LanguageExportForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LanguageExportForm.class.php
@@ -21,7 +21,7 @@ class LanguageExportForm extends AbstractForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.language';
+       public $activeMenuItem = 'wcf.acp.menu.link.language.list';
        
        /**
         * @inheritDoc

diff --git a/wcfsetup/install/files/lib/acp/form/NoticeEditForm.class.php b/wcfsetup/install/files/lib/acp/form/NoticeEditForm.class.php
index 9b09fe2a35050410dad0d1eb1ea645196015c728..01c19442b98ae5246aa4037d526cedbf9e1e8f45 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/NoticeEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/NoticeEditForm.class.php
@@ -21,7 +21,7 @@ class NoticeEditForm extends NoticeAddForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.notice';
+       public $activeMenuItem = 'wcf.acp.menu.link.notice.list';
        
        /**
         * edited notice object

diff --git a/wcfsetup/install/files/lib/acp/form/PackageUpdateServerEditForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageUpdateServerEditForm.class.php
index 4192071f7327260d85fb5755cee21c43ad79409d..68ecb76e6069367aa7a40e58407f13eea3bc5596 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/form/PackageUpdateServerEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PackageUpdateServerEditForm.class.php
@@ -15,6 +15,11 @@ use wcf\system\WCF;
  * @package    WoltLabSuite\Core\Acp\Form
  */
 class PackageUpdateServerEditForm extends PackageUpdateServerAddForm {
+       /**
+        * @inheritDoc
+        */
+       public $activeMenuItem = 'wcf.acp.menu.link.package.server.list';
+       
        /**
         * update server id
         * @var integer

diff --git a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionEditForm.class.php b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionEditForm.class.php
index 100a96174778625806e8bdff4585ebe1858295f7..ffa43a96928ad9eba022158b742f6df82b05daf8 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionEditForm.class.php
@@ -17,6 +17,11 @@ use wcf\system\WCF;
  * @package    WoltLabSuite\Core\Acp\Form
  */
 class PaidSubscriptionEditForm extends PaidSubscriptionAddForm {
+       /**
+        * @inheritDoc
+        */
+       public $activeMenuItem = 'wcf.acp.menu.link.paidSubscription.list';
+       
        /**
         * id of the edited subscription
         * @var integer

diff --git a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionUserAddForm.class.php b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionUserAddForm.class.php
index 48ae234398ea4f6159fdf73ab44630f0e0492c9f..11f76c5c1481ab4fc42652dba5d198b9b358ebc3 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionUserAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionUserAddForm.class.php
@@ -23,7 +23,7 @@ class PaidSubscriptionUserAddForm extends AbstractForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.paidSubscription';
+       public $activeMenuItem = 'wcf.acp.menu.link.paidSubscription.list';
        
        /**
         * @inheritDoc

diff --git a/wcfsetup/install/files/lib/acp/form/ReactionTypeEditForm.class.php b/wcfsetup/install/files/lib/acp/form/ReactionTypeEditForm.class.php
index c4eb369ed5e8b27d3e5f07c7df8e3bc9603d6d61..374b2008824368cda48125ec55a189f1834bad77 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/ReactionTypeEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/ReactionTypeEditForm.class.php
@@ -13,6 +13,11 @@ use wcf\system\exception\IllegalLinkException;
  * @since      3.2
  */
 class ReactionTypeEditForm extends ReactionTypeAddForm {
+       /**
+        * @inheritDoc
+        */
+       public $activeMenuItem = 'wcf.acp.menu.link.reactionType.list';
+       
        /**
         * @inheritDoc
         */

diff --git a/wcfsetup/install/files/lib/acp/form/SitemapEditForm.class.php b/wcfsetup/install/files/lib/acp/form/SitemapEditForm.class.php
index 674d11596c1e4aef90da2316f92d025d319d6210..4c3d47f64d770d3a6fd538561ef499cf2942d853 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/form/SitemapEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/SitemapEditForm.class.php
@@ -26,7 +26,7 @@ class SitemapEditForm extends AbstractForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.maintenance';
+       public $activeMenuItem = 'wcf.acp.menu.link.maintenance.sitemap';
        
        /**
         * @inheritDoc

diff --git a/wcfsetup/install/files/lib/acp/form/SmileyEditForm.class.php b/wcfsetup/install/files/lib/acp/form/SmileyEditForm.class.php
index 2410439157185d60e56632c19421ff73d79f6142..3a7f47b70dd7fd9bf569c9674d66d97109b44a6c 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/SmileyEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/SmileyEditForm.class.php
@@ -19,7 +19,7 @@ class SmileyEditForm extends SmileyAddForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.smiley';
+       public $activeMenuItem = 'wcf.acp.menu.link.smiley.list';
        
        /**
         * @inheritDoc

diff --git a/wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php b/wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php
index c52b89d722165ca6a572d9dd7004639abc5aa04a..29aaf910637a8404e5b10d3f5a39b319cb371005 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php
@@ -20,7 +20,7 @@ class StyleEditForm extends StyleAddForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.style';
+       public $activeMenuItem = 'wcf.acp.menu.link.style.list';
        
        /**
         * style object

diff --git a/wcfsetup/install/files/lib/acp/form/StyleExportForm.class.php b/wcfsetup/install/files/lib/acp/form/StyleExportForm.class.php
index e44cdb50d9748ab46e36ac719b37aeed79db3ebf..51e7bd904f09c5bcae56983f35cd591be334c8fc 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/StyleExportForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/StyleExportForm.class.php
@@ -18,7 +18,7 @@ class StyleExportForm extends AbstractForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.style';
+       public $activeMenuItem = 'wcf.acp.menu.link.style.list';
        
        /**
         * true, if style has custom images

diff --git a/wcfsetup/install/files/lib/acp/form/TagEditForm.class.php b/wcfsetup/install/files/lib/acp/form/TagEditForm.class.php
index aba51b718db8a10081b7baa68081ee1f54955735..3ee44068076b27426c96fdcc98b49765cc6a0d40 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/TagEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/TagEditForm.class.php
@@ -20,7 +20,7 @@ class TagEditForm extends TagAddForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.tag';
+       public $activeMenuItem = 'wcf.acp.menu.link.tag.list';
        
        /**
         * @inheritDoc

diff --git a/wcfsetup/install/files/lib/acp/form/TemplateEditForm.class.php b/wcfsetup/install/files/lib/acp/form/TemplateEditForm.class.php
index b65369a5b4cb0da39e2592f34687b927d76368cb..42175d8a55368f1890591491f97bfbf186ad82f1 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/TemplateEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/TemplateEditForm.class.php
@@ -18,7 +18,7 @@ class TemplateEditForm extends TemplateAddForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.template';
+       public $activeMenuItem = 'wcf.acp.menu.link.template.list';
        
        /**
         * template id

diff --git a/wcfsetup/install/files/lib/acp/form/TemplateGroupEditForm.class.php b/wcfsetup/install/files/lib/acp/form/TemplateGroupEditForm.class.php
index b8efa0218a21c6a6ad95081bcb48cd30ffcf8a54..0594b798c82cc95d8dda7b014751f4c05db0fc28 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/TemplateGroupEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/TemplateGroupEditForm.class.php
@@ -19,7 +19,7 @@ class TemplateGroupEditForm extends TemplateGroupAddForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.template';
+       public $activeMenuItem = 'wcf.acp.menu.link.template.group.list';
        
        /**
         * template group id

diff --git a/wcfsetup/install/files/lib/acp/form/TrophyCategoryEditForm.class.php b/wcfsetup/install/files/lib/acp/form/TrophyCategoryEditForm.class.php
index 1c8687abfde824eaf82719ca5a43d43c5e0dc730..0ba407897ee35341d87152ac61857ae2b11b829b 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/TrophyCategoryEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/TrophyCategoryEditForm.class.php
@@ -14,7 +14,7 @@ class TrophyCategoryEditForm extends AbstractCategoryEditForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.trophy';
+       public $activeMenuItem = 'wcf.acp.menu.link.trophy.category.list';
        
        /**
         * @inheritDoc

diff --git a/wcfsetup/install/files/lib/acp/form/TrophyEditForm.class.php b/wcfsetup/install/files/lib/acp/form/TrophyEditForm.class.php
index 55a456ed5aeae5c33296f928e478147c20f69b65..047fc0ccf08fe0bf6882a8b51bfec1febb8a7ca6 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/TrophyEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/TrophyEditForm.class.php
@@ -25,7 +25,7 @@ class TrophyEditForm extends TrophyAddForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.trophy';
+       public $activeMenuItem = 'wcf.acp.menu.link.trophy.list';
        
        /**
         * @inheritDoc

diff --git a/wcfsetup/install/files/lib/acp/form/UserAssignToGroupForm.class.php b/wcfsetup/install/files/lib/acp/form/UserAssignToGroupForm.class.php
index ba87e72acb0a6b9b34e4b139ebbdcd8664a7f760..2ad002d3a12574ee02356363c96883cada4753f8 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/form/UserAssignToGroupForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserAssignToGroupForm.class.php
@@ -32,7 +32,7 @@ class UserAssignToGroupForm extends AbstractForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.user.management';
+       public $activeMenuItem = 'wcf.acp.menu.link.user.list';
        
        /**
         * ids of the relevant users

diff --git a/wcfsetup/install/files/lib/acp/form/UserContentRevertChangesForm.class.php b/wcfsetup/install/files/lib/acp/form/UserContentRevertChangesForm.class.php
index 6548e0da026623dfd84dd05faafca295bdf2c840..c3f7db8591e27747b94051c97950c7facc42fa92 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/UserContentRevertChangesForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserContentRevertChangesForm.class.php
@@ -30,7 +30,7 @@ class UserContentRevertChangesForm extends AbstractForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.user.management';
+       public $activeMenuItem = 'wcf.acp.menu.link.user.list';
        
        /**
         * ids of the relevant users

diff --git a/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
index c6ea0be4902eb65ecba998bc4672cb1e4250b0b4..98de7b174fbc767e9ad2dfcefe384984cf1e39a1 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
@@ -30,7 +30,7 @@ class UserEditForm extends UserAddForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.user.management';
+       public $activeMenuItem = 'wcf.acp.menu.link.user.list';
        
        /**
         * @inheritDoc

diff --git a/wcfsetup/install/files/lib/acp/form/UserEmailAddressExportForm.class.php b/wcfsetup/install/files/lib/acp/form/UserEmailAddressExportForm.class.php
index db0a9942c0b219620fb1ff1923f0a589ef0e8351..3da43192e9b3ad930bf7c2f4cc6b78e7318292e0 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/form/UserEmailAddressExportForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserEmailAddressExportForm.class.php
@@ -21,7 +21,7 @@ class UserEmailAddressExportForm extends AbstractForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.user.management';
+       public $activeMenuItem = 'wcf.acp.menu.link.user.list';
        
        /**
         * @inheritDoc

diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentEditForm.class.php
index 97121cd6d92e0f85d3af96ba46b2e15c1f4d6fa8..873f0d65df94722f073c68f37724ceb92ec8fb14 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentEditForm.class.php
@@ -16,6 +16,11 @@ use wcf\system\WCF;
  * @package    WoltLabSuite\Core\Acp\Form
  */
 class UserGroupAssignmentEditForm extends UserGroupAssignmentAddForm {
+       /**
+        * @inheritDoc
+        */
+       public $activeMenuItem = 'wcf.acp.menu.link.group.assignment';
+
        /**
         * edited automatic user group assignment
         * @var UserGroupAssignment

diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php
index 092486daea9662627838613c9cdd8d6fecb74e0a..79f81dc5a64b2a6e98f8e97e09fff4ecc36ed02b 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php
@@ -21,7 +21,7 @@ class UserGroupEditForm extends UserGroupAddForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.group';
+       public $activeMenuItem = 'wcf.acp.menu.link.group.list';
        
        /**
         * @inheritDoc

diff --git a/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php b/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php
index ad6333d55a16087a55da098ac73edd7708812a67..04bc1c71b317515b7801b5ec27713ce67d72da05 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php
@@ -94,7 +94,7 @@ class UserMailForm extends AbstractForm {
                
                if (isset($_GET['id'])) $this->userID = intval($_GET['id']);
                
-               $this->activeMenuItem = ($this->action == 'all' ? 'wcf.acp.menu.link.user.mail' : ($this->action == 'group' ? 'wcf.acp.menu.link.group.mail' : 'wcf.acp.menu.link.user.management'));
+               $this->activeMenuItem = ($this->action == 'all' ? 'wcf.acp.menu.link.user.mail' : ($this->action == 'group' ? 'wcf.acp.menu.link.group.mail' : 'wcf.acp.menu.link.user.list'));
        }
        
        /**

diff --git a/wcfsetup/install/files/lib/acp/form/UserMergeForm.class.php b/wcfsetup/install/files/lib/acp/form/UserMergeForm.class.php
index cc9487ee2bc64b11871ec785360630341fe7ed7f..d6d587bede80715021dd0538f74d6efecf5ee14e 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/UserMergeForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserMergeForm.class.php
@@ -28,7 +28,7 @@ class UserMergeForm extends AbstractForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.user.management';
+       public $activeMenuItem = 'wcf.acp.menu.link.user.list';
        
        /**
         * ids of the relevant users

diff --git a/wcfsetup/install/files/lib/acp/form/UserOptionCategoryEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserOptionCategoryEditForm.class.php
index a6ed3f33e875d971d3f720a0b180c412e78b540b..1a3b07d9808b2813d4e3c318948d2a357ffe8c8b 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/UserOptionCategoryEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserOptionCategoryEditForm.class.php
@@ -19,7 +19,7 @@ class UserOptionCategoryEditForm extends UserOptionCategoryAddForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.user.option';
+       public $activeMenuItem = 'wcf.acp.menu.link.user.option.category.list';
        
        /**
         * category id

diff --git a/wcfsetup/install/files/lib/acp/form/UserOptionEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserOptionEditForm.class.php
index ff58f132b12dc5bab8af25618905c2c0944a6034..566803a63bc585b9473e624a8d3790281df38791 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/UserOptionEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserOptionEditForm.class.php
@@ -19,7 +19,7 @@ class UserOptionEditForm extends UserOptionAddForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.user.option';
+       public $activeMenuItem = 'wcf.acp.menu.link.user.option.list';
        
        /**
         * user option id

diff --git a/wcfsetup/install/files/lib/acp/form/UserRankEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserRankEditForm.class.php
index c6f35c42157d3870bb612d8a967a30dd98bb9653..2a973ac5de0a6489b187d39948b98e044448062c 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/UserRankEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserRankEditForm.class.php
@@ -19,7 +19,7 @@ class UserRankEditForm extends UserRankAddForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.user.rank';
+       public $activeMenuItem = 'wcf.acp.menu.link.user.rank.list';
        
        /**
         * rank id

diff --git a/wcfsetup/install/files/lib/acp/form/UserTrophyEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserTrophyEditForm.class.php
index 71217f82935399e4c090c5f66580d84de8276b61..5f86f918d20e52fc89357f33628c16435c6ff5c5 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/UserTrophyEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserTrophyEditForm.class.php
@@ -19,7 +19,7 @@ class UserTrophyEditForm extends UserTrophyAddForm {
        /**
         * @inheritDoc
         */
-       public $activeMenuItem = 'wcf.acp.menu.link.trophy';
+       public $activeMenuItem = 'wcf.acp.menu.link.userTrophy.list';
        
        /**
         * @inheritDoc