Confirm email addresses on enabling users only, if the user cannot confirm the email...

diff --git a/wcfsetup/install/files/lib/data/user/UserAction.class.php b/wcfsetup/install/files/lib/data/user/UserAction.class.php
index cda50c2615fc768d048b945789a0b8326ebfcb2d..a0c4abf00d99097499e4b0bb7635c27b78199b70 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/UserAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/UserAction.class.php
@@ -679,12 +679,17 @@ class UserAction extends AbstractDatabaseObjectAction implements IClipboardActio
        public function enable() {
                if (empty($this->objects)) $this->readObjects();
                
+               $data = [
+                       'activationCode' => 0,
+                       'blacklistMatches' => '',
+               ];
+               
+               if (!(REGISTER_ACTIVATION_METHOD & User::REGISTER_ACTIVATION_USER)) {
+                       $data['emailConfirmed'] = null;
+               }
+               
                $action = new UserAction($this->objects, 'update', [
-                       'data' => [
-                               'activationCode' => 0,
-                               'blacklistMatches' => '',
-                               'emailConfirmed' => null,
-                       ],
+                       'data' => $data,
                        'removeGroups' => UserGroup::getGroupIDsByType([UserGroup::GUESTS])
                ]);
                $action->executeAction();