From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Wed, 15 May 2019 16:30:15 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 5.2.0_Alpha_1~86
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=114dcb81a94c760243f5709dd154036928509d0a;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

114dcb81a94c760243f5709dd154036928509d0a
diff --cc wcfsetup/install/files/lib/form/ContactForm.class.php
index fd8278e808,5316132c26..6e2dfe4a18
--- a/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,
+ 			'recipientID' => $this->recipientID,
 -			'privacyPolicyConfirmed' => $this->privacyPolicyConfirmed
 +			'privacyPolicyConfirmed' => $this->privacyPolicyConfirmed,
 +			'attachmentHandler' => $this->attachmentHandler,
 +			'attachmentObjectID' => 0,
 +			'attachmentObjectType' => $this->attachmentObjectType,
 +			'attachmentParentObjectID' => 0,
 +			'tmpHash' => $this->tmpHash,
  		]);
  	}
  }
diff --cc wcfsetup/install/lang/en.xml
index 806ec8ac24,fb5d835451..a759acc61d
--- a/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>