diff --git a/src/Security/Member.php b/src/Security/Member.php index 6d9889989d6..f35f5789d8c 100644 --- a/src/Security/Member.php +++ b/src/Security/Member.php @@ -1705,6 +1705,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) {