Merge branch 'master' into media-consent

diff --cc com.woltlab.wcf/option.xml
index e12cbd2b8086660c82ea351572f2c7ac24df7ef3,d8db18b80476d3708a741d6035ed54f019dc0509..bf585ce06babf59170322f25ca6e76c529f0361c
--- 1/com.woltlab.wcf/option.xml
--- 2/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@@ -1544,11 -1544,14 +1544,19 @@@ rub
  rust
  go</defaultvalue>
                        </option>
 +                      <option name="message_enable_user_consent">
 +                              <categoryname>message.general</categoryname>
 +                              <optiontype>boolean</optiontype>
 +                              <defaultvalue>1</defaultvalue>
 +                      </option>
+                       <option name="modification_log_expiration">
+                               <categoryname>message.general</categoryname>
+                               <optiontype>integer</optiontype>
+                               <defaultvalue>0</defaultvalue>
+                               <minvalue>0</minvalue>
+                               <maxvalue>365</maxvalue>
+                               <suffix>days</suffix>
+                       </option>
                        <!-- /message.general -->
                        <option name="search_results_per_page">
                                <categoryname>message.search</categoryname>

diff --cc com.woltlab.wcf/userOption.xml
Simple merge

diff --cc constants.php
index a960771b6a480608e9cd7110375afa91685a82d2,66970fe2572c7e274a6d668b3f996dff0034b6d4..81965a12cde5b69fba23017c80dcab08d4d36d1c
--- 1/constants.php
--- 2/constants.php
+++ b/constants.php
@@@ -263,4 -263,4 +263,5 @@@ define('BLACKLIST_SFS_EMAIL_ADDRESS', '
  define('BLACKLIST_SFS_IP_ADDRESS', '90percentile');
  define('BLACKLIST_SFS_ACTION', 'disable');
  define('ENABLE_ENTERPRISE_MODE', 0);
 +define('MESSAGE_ENABLE_USER_CONSENT', 1);
+ define('MODIFICATION_LOG_EXPIRATION', 0);

diff --cc wcfsetup/install/lang/de.xml
index cfe0d5edaa43caf06cd39caa18fa119cf45faa1a,b3ba3bb06330d143b4237df9a8d1808c0652fe7a..65b2ea3f1b77263893396b9ddfd971c806c7ca40
--- 1/wcfsetup/install/lang/de.xml
--- 2/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@@ -1762,7 -1763,8 +1763,9 @@@ Die Datenbestände werden sorgfältig g
                <item name="wcf.acp.option.blacklist_sfs_action.description"><![CDATA[Es besteht immer das Risiko eines fehlerhaften Eintrages, daher wird die Einstellung <strong>Deaktivierung, erfordert manuelle Freischaltung</strong> ausdrücklich empfohlen.]]></item>
                <item name="wcf.acp.option.blacklist_sfs_action.disable"><![CDATA[Deaktivierung, erfordert manuelle Freischaltung]]></item>
                <item name="wcf.acp.option.module_amp"><![CDATA[<abbr title="Accelerated Mobile Pages">AMP</abbr>]]></item>
 +              <item name="wcf.acp.option.message_enable_user_consent"><![CDATA[Inhalte von externen Anbietern erst nach Zustimmung anzuzeigen]]></item>
+               <item name="wcf.acp.option.modification_log_expiration"><![CDATA[Speicherzeit für Änderungen]]></item>
+               <item name="wcf.acp.option.modification_log_expiration.description"><![CDATA[Zeitraum, nachdem alte Änderungen aus dem Änderungsprotokoll entfernt werden [0, um die Entfernung gänzlich zu deaktivieren]]]></item>
        </category>
        <category name="wcf.acp.customOption">
                <item name="wcf.acp.customOption.list"><![CDATA[Eingabefelder]]></item>

diff --cc wcfsetup/install/lang/en.xml
index abc2804f204b71ec391f7f8a4972d60d30efe779,ada3909315d94a57b6e7d939506f4c966263d3e8..957e6536bcccb3e3ce00103563067b69071923fd
--- 1/wcfsetup/install/lang/en.xml
--- 2/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -1746,7 -1747,8 +1747,9 @@@ The database is carefully maintained, b
                <item name="wcf.acp.option.blacklist_sfs_action.description"><![CDATA[There is always the risk of a false-positive match, therefore it is highly recommended to set it to <strong>Disable and require manual approval</strong>.]]></item>
                <item name="wcf.acp.option.blacklist_sfs_action.disable"><![CDATA[Disable and require manual approval]]></item>
                <item name="wcf.acp.option.module_amp"><![CDATA[<abbr title="Accelerated Mobile Pages">AMP</abbr>]]></item>
 +              <item name="wcf.acp.option.message_enable_user_consent"><![CDATA[Prompt users before displaying content from external sources]]></item>
+               <item name="wcf.acp.option.modification_log_expiration"><![CDATA[Storage Time for Modification Logs]]></item>
+               <item name="wcf.acp.option.modification_log_expiration.description"><![CDATA[Modification logs will be deleted after the entered amount of days. To disable deleting old modification logs, enter “0”.]]></item>
        </category>
        <category name="wcf.acp.customOption">
                <item name="wcf.acp.customOption.list"><![CDATA[Option Fields]]></item>