Merge branch 'master' into next

diff --cc com.woltlab.wcf/templates/cms.tpl
Simple merge

diff --cc com.woltlab.wcf/templates/contact.tpl
Simple merge

diff --cc com.woltlab.wcf/templates/moderationList.tpl
Simple merge

diff --cc wcfsetup/install/files/lib/form/ContactForm.class.php
index fd8278e808b731fca9ffc60189c2acf381362336,5316132c2686b67b85d78d795e7d9802d3399fa4..6e2dfe4a1838e8d8bb5dba50fe3c1dced873830e
--- 1/wcfsetup/install/files/lib/form/ContactForm.class.php
--- 2/wcfsetup/install/files/lib/form/ContactForm.class.php
+++ b/wcfsetup/install/files/lib/form/ContactForm.class.php
@@@ -232,12 -199,8 +232,13 @@@ class ContactForm extends AbstractCaptc
                        'name' => $this->name,
                        'options' => $this->optionHandler->getOptions(),
                        'recipientList' => $this->recipientList,
 -                      'privacyPolicyConfirmed' => $this->privacyPolicyConfirmed
+                       'recipientID' => $this->recipientID,
 +                      'privacyPolicyConfirmed' => $this->privacyPolicyConfirmed,
 +                      'attachmentHandler' => $this->attachmentHandler,
 +                      'attachmentObjectID' => 0,
 +                      'attachmentObjectType' => $this->attachmentObjectType,
 +                      'attachmentParentObjectID' => 0,
 +                      'tmpHash' => $this->tmpHash,
                ]);
        }
  }

diff --cc wcfsetup/install/files/lib/system/background/job/EmailDeliveryBackgroundJob.class.php
Simple merge

diff --cc wcfsetup/install/lang/de.xml
Simple merge

diff --cc wcfsetup/install/lang/en.xml
index 806ec8ac24fc6a91f9e201a76606ae1237c7e231,fb5d8354511c91a5498bb408484e61b6f5264099..a759acc61de354ddfae0bb6cd6baa4cc1e1bc469
--- 1/wcfsetup/install/lang/en.xml
--- 2/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -4413,9 -3478,10 +4413,10 @@@ Attachments
                <item name="wcf.user.option.error.validationFailed"><![CDATA[The entered text is invalid.]]></item>
                <item name="wcf.user.option.error.birthdayTooYoung"><![CDATA[You are not old enough. To register with this website you must be at least {#REGISTER_MIN_USER_AGE} years old.]]></item>
                <item name="wcf.user.option.error.censoredWordsFound"><![CDATA[The text contains censored words: {implode from=$censoredWords key=censoredWord item=number}{$censoredWord}{if $number > 1} ({#$number}×){/if}{/implode}.]]></item>
+               <item name="wcf.user.option.error.disallowedBBCodes"><![CDATA[The message contains disallowed BBCodes: {implode from=$disallowedBBCodes item=disallowedBBCode}{$disallowedBBCode}{/implode}.]]></item>
                <item name="wcf.user.error.isBanned"><![CDATA[Your user account has been banned{if $__wcf->user->banExpires != 0} until {@$__wcf->user->banExpires|plainTime}{/if}{if $__wcf->user->banReason}: {@$__wcf->user->banReason|newlineToBreak}{else}.{/if}]]></item>
                <item name="wcf.user.access.everyone"><![CDATA[Everyone]]></item>
 -              <item name="wcf.user.access.following"><![CDATA[Followed Users]]></item>
 +              <item name="wcf.user.access.following"><![CDATA[Users I Follow]]></item>
                <item name="wcf.user.access.nobody"><![CDATA[Nobody]]></item>
                <item name="wcf.user.access.registered"><![CDATA[Registered Users]]></item>
                <item name="wcf.user.button.login"><![CDATA[Login]]></item>