Merge branch '5.3' into 5

silverstripe · Feb 9, 2025 · 8a2a7cc · 8a2a7cc
2 parents 042da0b + dac6b9e
commit 8a2a7cc
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/Security/Member.php b/src/Security/Member.php
@@ -1706,6 +1706,16 @@ public function getHtmlEditorConfigForCMS()
         $currentName = '';
         $currentPriority = 0;
 
+        // If we don't have a custom config, no need to look in all groups
+        $editorConfigMap = HTMLEditorConfig::get_available_configs_map();
+        $editorConfigCount = count($editorConfigMap);
+        if ($editorConfigCount === 0) {
+            return 'cms';
+        }
+        if ($editorConfigCount === 1) {
+            return key($editorConfigMap);
+        }
+
         foreach ($this->Groups() as $group) {
             $configName = $group->HtmlEditorConfig;
             if ($configName) {