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

[GitHub/WoltLab/WCF.git] / com.woltlab.wcf / bbcode.xml

diff --git a/com.woltlab.wcf/bbcode.xml b/com.woltlab.wcf/bbcode.xml
index 4e3a673b0faad9c5d8b916d77c38c254e10cc07c..096dd6eb186918f60f0aab13cc466f27126665a3 100644 (file)
--- a/com.woltlab.wcf/bbcode.xml
+++ b/com.woltlab.wcf/bbcode.xml
@@ -213,6 +213,9 @@
                                        <validationpattern>^\d+$</validationpattern>
                                        <required>1</required>
                                </attribute>
+                               <attribute name="1">
+                                       <usetext>1</usetext>
+                               </attribute>
                        </attributes>
                </bbcode>
                
@@ -225,5 +228,12 @@
                                </attribute>
                        </attributes>
                </bbcode>
+               
+               <bbcode name="html">
+                       <isBlockElement>1</isBlockElement>
+                       <sourcecode>1</sourcecode>
+                       <wysiwygicon>fa-html5</wysiwygicon>
+                       <buttonlabel>wcf.editor.button.woltlabHtml</buttonlabel>
+               </bbcode>
        </import>
 </data>