From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Mon, 4 Sep 2017 20:42:56 +0000 (+0200)
Subject: Sync wysiwygToolbar ACP template with frontend version
X-Git-Tag: 3.1.0_Alpha_3~19
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c01f2636f0da481f028b01e1d4521e1245a4dfa8;p=GitHub%2FWoltLab%2FWCF.git

Sync wysiwygToolbar ACP template with frontend version
---

diff --git a/wcfsetup/install/files/acp/templates/wysiwygToolbar.tpl b/wcfsetup/install/files/acp/templates/wysiwygToolbar.tpl
index 1e5a21ab84..642d5076d3 100644
--- a/wcfsetup/install/files/acp/templates/wysiwygToolbar.tpl
+++ b/wcfsetup/install/files/acp/templates/wysiwygToolbar.tpl
@@ -78,7 +78,14 @@ buttons.push('wcfSeparator');
 buttons.push('woltlabQuote');
 
 {foreach from=$__wcf->getBBCodeHandler()->getButtonBBCodes(true) item=__bbcode}
-	buttonOptions['{$__bbcode->bbcodeTag}'] = { icon: '{$__bbcode->wysiwygIcon}', title: '{lang}{$__bbcode->buttonLabel}{/lang}' };
-	buttons.push('{$__bbcode->bbcodeTag}');
-	customButtons.push('{$__bbcode->bbcodeTag}');
+	{* the HTML bbcode must be handled differently, it conflicts with the `source` toggle-button *}
+	{if $__bbcode->bbcodeTag === 'html'}
+		buttonOptions['woltlabHtml'] = { icon: '{$__bbcode->wysiwygIcon}', title: '{lang}{$__bbcode->buttonLabel}{/lang}' };
+		buttons.push('woltlabHtml');
+		customButtons.push('woltlabHtml');
+	{else}
+		buttonOptions['{$__bbcode->bbcodeTag}'] = { icon: '{$__bbcode->wysiwygIcon}', title: '{lang}{$__bbcode->buttonLabel}{/lang}' };
+		buttons.push('{$__bbcode->bbcodeTag}');
+		customButtons.push('{$__bbcode->bbcodeTag}');
+	{/if}
 {/foreach}