Merge branch '6.0'

diff --cc wcfsetup/install/files/lib/form/RegisterForm.class.php
index 8b619abfb462ea15d1e8bb0ef8fc30027624d253,5d22eccd31220fa029d2b4fc8ab0635b25e59e34..5e5616d86c78373ccc53ef79a86b4b9f33b5b080
--- 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
@@@ -447,10 -446,14 +449,14 @@@ class RegisterForm extends UserAddFor
              $this->message = 'wcf.user.register.success';
  
              UserGroupAssignmentHandler::getInstance()->checkUsers([$user->userID]);
 -        } elseif (REGISTER_ACTIVATION_METHOD & User::REGISTER_ACTIVATION_USER && empty($this->blacklistMatches)) {
 +        } elseif (REGISTER_ACTIVATION_METHOD & User::REGISTER_ACTIVATION_USER && !$this->spamCheckEvent->hasMatches()) {
              // registering via 3rdParty leads to instant activation
              if ($registerVia3rdParty) {
-                 $this->message = 'wcf.user.register.success';
+                 if (REGISTER_ACTIVATION_METHOD & User::REGISTER_ACTIVATION_ADMIN) {
+                     $this->message = 'wcf.user.register.success.awaitActivation';
+                 } else {
+                     $this->message = 'wcf.user.register.success';
+                 }
              } else {
                  $email = new Email();
                  $email->addRecipient(new UserMailbox(WCF::getUser()));

diff --cc wcfsetup/install/files/style/layout/form.scss
Simple merge