From 2fa2aa356ffd1b6099263d48662dd0ac14b41665 Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <guy.sartorelli@gmail.com>
Date: Tue, 15 Oct 2024 12:51:55 +1300
Subject: [PATCH 1/2] ENH Use config instead of runtime code to remove menu
 items

---
 _config.php                                    | 10 ----------
 code/Controllers/CMSPageAddController.php      |  2 ++
 code/Controllers/CMSPageEditController.php     |  2 ++
 code/Controllers/CMSPageSettingsController.php |  2 ++
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/_config.php b/_config.php
index 0fb43491fc..6c1deee0d3 100644
--- a/_config.php
+++ b/_config.php
@@ -1,10 +1,5 @@
 <?php
 
-use SilverStripe\Admin\CMSMenu;
-use SilverStripe\CMS\Controllers\CMSMain;
-use SilverStripe\CMS\Controllers\CMSPageAddController;
-use SilverStripe\CMS\Controllers\CMSPageEditController;
-use SilverStripe\CMS\Controllers\CMSPageSettingsController;
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Core\Manifest\ModuleLoader;
 use SilverStripe\Forms\HTMLEditor\TinyMCEConfig;
@@ -31,8 +26,3 @@
     'sitetree_link',
     [SiteTree::class, 'link_shortcode_handler']
 );
-
-CMSMenu::remove_menu_class(CMSMain::class);
-CMSMenu::remove_menu_class(CMSPageEditController::class);
-CMSMenu::remove_menu_class(CMSPageSettingsController::class);
-CMSMenu::remove_menu_class(CMSPageAddController::class);
diff --git a/code/Controllers/CMSPageAddController.php b/code/Controllers/CMSPageAddController.php
index 37f1e22166..59a3a5c1d3 100644
--- a/code/Controllers/CMSPageAddController.php
+++ b/code/Controllers/CMSPageAddController.php
@@ -32,6 +32,8 @@ class CMSPageAddController extends CMSPageEditController
     private static $menu_title = 'Add page';
     private static $required_permission_codes = 'CMS_ACCESS_CMSMain';
 
+    private static $ignore_menuitem = true;
+
     private static $allowed_actions = [
         'AddForm',
         'doAdd',
diff --git a/code/Controllers/CMSPageEditController.php b/code/Controllers/CMSPageEditController.php
index 271d592941..2bd91981d6 100644
--- a/code/Controllers/CMSPageEditController.php
+++ b/code/Controllers/CMSPageEditController.php
@@ -28,6 +28,8 @@ class CMSPageEditController extends CMSMain
 
     private static $required_permission_codes = 'CMS_ACCESS_CMSMain';
 
+    private static $ignore_menuitem = true;
+
     private static $allowed_actions = [
         'AddToCampaignForm',
     ];
diff --git a/code/Controllers/CMSPageSettingsController.php b/code/Controllers/CMSPageSettingsController.php
index 34353c7c50..bf40157367 100644
--- a/code/Controllers/CMSPageSettingsController.php
+++ b/code/Controllers/CMSPageSettingsController.php
@@ -15,6 +15,8 @@ class CMSPageSettingsController extends CMSMain
 
     private static $required_permission_codes = 'CMS_ACCESS_CMSMain';
 
+    private static $ignore_menuitem = true;
+
     public function getEditForm($id = null, $fields = null)
     {
         $record = $this->getRecord($id ?: $this->currentPageID());

From b07789db4404d8a5d3b768d631b3b69745dd49db Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <guy.sartorelli@gmail.com>
Date: Tue, 15 Oct 2024 12:53:02 +1300
Subject: [PATCH 2/2] API Update method signature to match parent class

---
 code/Controllers/CMSPageEditController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/Controllers/CMSPageEditController.php b/code/Controllers/CMSPageEditController.php
index 2bd91981d6..67dcfb3827 100644
--- a/code/Controllers/CMSPageEditController.php
+++ b/code/Controllers/CMSPageEditController.php
@@ -34,7 +34,7 @@ class CMSPageEditController extends CMSMain
         'AddToCampaignForm',
     ];
 
-    public function getClientConfig()
+    public function getClientConfig(): array
     {
         return ArrayLib::array_merge_recursive(parent::getClientConfig(), [
             'form' => [