Merge branch 'next' into exception-notifier

diff --cc com.woltlab.wcf/cronjob.xml
index affba31de8124f66a69931dd4d338297a8f3f3ab,012ea2c0156cd6082365758e8c4139124e905903..c6d28f11d7e5194d67d378268d7662682f5e50c0
--- 1/com.woltlab.wcf/cronjob.xml
--- 2/com.woltlab.wcf/cronjob.xml
+++ b/com.woltlab.wcf/cronjob.xml
@@@ -202,15 -202,18 +202,28 @@@
                        <startdow>*</startdow>
                        <canbedisabled>0</canbedisabled>
                </cronjob>
 +              <cronjob name="com.woltlab.wcf.exceptionMailer">
 +                      <classname>wcf\system\cronjob\ExceptionMailerCronjob</classname>
 +                      <description>Sends out notifications about new entries in the error log.</description>
 +                      <description language="de">Versendet Benachrichtigungen über neue Einträge im Fehlerprotokoll.</description>
 +                      <startminute>0</startminute>
 +                      <starthour>5</starthour>
 +                      <startdom>*</startdom>
 +                      <startmonth>*</startmonth>
 +                      <startdow>*</startdow>
 +              </cronjob>
+               <cronjob name="com.woltlab.wcf.updateBlacklist">
+                       <classname>wcf\system\cronjob\UpdateBlacklistCronjob</classname>
+                       <description>Refreshes the blacklist for spam prevention</description>
+                       <description language="de">Aktualisiert die Sperrlisten zur Spambekämpfung</description>
+                       <!-- Runs once every hour, even though the data is only refreshed every 6 hours,
+                            but allows instances to catch up when it misses some updates. -->
+                       <startminute>15</startminute>
+                       <starthour>*</starthour>
+                       <startdom>*</startdom>
+                       <startmonth>*</startmonth>
+                       <startdow>*</startdow>
+                       <canbedisabled>0</canbedisabled>
+               </cronjob>
        </import>
  </data>

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

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