Merge remote-tracking branch 'origin/next-stopforumspam' into next

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

diff --cc com.woltlab.wcf/templates/userNotice.tpl
index 41ef605c52b0f8528361f302c3eda8d5787ccdf5,5ce3635f80d72c3276c8dc8913c81d7f85d70c27..9ddcdff1e83697d7ca048566a995d5b9f2400b93
--- 1/com.woltlab.wcf/templates/userNotice.tpl
--- 2/com.woltlab.wcf/templates/userNotice.tpl
+++ b/com.woltlab.wcf/templates/userNotice.tpl
@@@ -7,11 -7,11 +7,11 @@@
        {/if}
        
        {if $__wcf->session->getPermission('admin.configuration.package.canUpdatePackage') && $__wcf->getAvailableUpdates() && SHOW_UPDATE_NOTICE_FRONTEND}
 -              <p class="info">{lang}wcf.page.availableUpdates{/lang}</p>
 +              <p class="info" role="status">{lang}wcf.page.availableUpdates{/lang}</p>
        {/if}
        
-       {if $__wcf->user->activationCode && REGISTER_ACTIVATION_METHOD == 1 && $templateName != 'registerActivation' && $templateName != 'register' && $templateName != 'redirect'}
+       {if $__wcf->user->activationCode && REGISTER_ACTIVATION_METHOD == 1 && $templateName != 'registerActivation' && $templateName != 'register' && $templateName != 'redirect' && $__wcf->user->getBlacklistMatches()|empty}
 -              <p class="warning">{lang}wcf.user.register.needActivation{/lang}</p>
 +              <p class="warning" role="status">{lang}wcf.user.register.needActivation{/lang}</p>
        {/if}
        
        {hascontent}

diff --cc wcfsetup/install/files/lib/form/RegisterForm.class.php
index dc04cf4e1f0b022a04c8953586edb4508e20f3b8,92e9183ade1fd5a38a6b26f73f9d9a013bdfd4bb..1d27627ed42590539689373f8521bf3e77975ad4
--- 1/wcfsetup/install/files/lib/form/RegisterForm.class.php
--- 2/wcfsetup/install/files/lib/form/RegisterForm.class.php
+++ b/wcfsetup/install/files/lib/form/RegisterForm.class.php
@@@ -455,12 -471,10 +473,12 @@@ class RegisterForm extends UserAddForm 
                }
                
                // activation management
-               if (REGISTER_ACTIVATION_METHOD == 0) {
+               if (REGISTER_ACTIVATION_METHOD == 0 && empty($this->blacklistMatches)) {
                        $this->message = 'wcf.user.register.success';
 +                      
 +                      UserGroupAssignmentHandler::getInstance()->checkUsers([$user->userID]);
                }
-               else if (REGISTER_ACTIVATION_METHOD == 1) {
+               else if (REGISTER_ACTIVATION_METHOD == 1 && empty($this->blacklistMatches)) {
                        // registering via 3rdParty leads to instant activation
                        if ($registerVia3rdParty) {
                                $this->message = 'wcf.user.register.success';

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

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