From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 6 Jul 2017 11:55:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'refs/remotes/origin/3.0'
X-Git-Tag: 3.1.0_Alpha_1~296
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9404a7d8880ab8ba092e774600a6495f4b04d59b;p=GitHub%2FWoltLab%2FWCF.git

Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
#	com.woltlab.wcf/templates/wysiwyg.tpl
#	wcfsetup/install/files/js/3rdParty/redactor2/plugins/combined.min.js
#	wcfsetup/install/files/js/WoltLabSuite.Core.min.js
---

9404a7d8880ab8ba092e774600a6495f4b04d59b
diff --cc com.woltlab.wcf/templates/wysiwyg.tpl
index c4293b7bc2,34aa4ae85c..7c5e77fa05
--- a/com.woltlab.wcf/templates/wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/wysiwyg.tpl
@@@ -205,8 -202,7 +205,8 @@@
  					'WoltLabDropdown',
  					{if $__wcf->getBBCodeHandler()->isAvailableBBCode('font')}'WoltLabFont',{/if}
  					'WoltLabFullscreen',
 +					{if $__wcf->getBBCodeHandler()->isAvailableBBCode('html')}'WoltLabHtml',{/if}
- 					{if $__wcf->getBBCodeHandler()->isAvailableBBCode('img')}'WoltLabImage',{/if}
+ 					'WoltLabImage',
  					'WoltLabInlineCode',
  					'WoltLabInsert',
  					'WoltLabLine',