Allow resending activation mails for users w/o a confirmed email

diff --git a/wcfsetup/install/files/lib/data/user/UserAction.class.php b/wcfsetup/install/files/lib/data/user/UserAction.class.php
index fdca5cf1b0e94ae10f60aba1607558630ab517d2..cda50c2615fc768d048b945789a0b8326ebfcb2d 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/UserAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/UserAction.class.php
@@ -1067,7 +1067,7 @@ class UserAction extends AbstractDatabaseObjectAction implements IClipboardActio
                
                foreach ($this->objects as $object) {
                        /** @var UserEditor $object */
-                       if (!$object->requiresEmailActivation()) {
+                       if (!$object->canEmailConfirm()) {
                                throw new UserInputException('objectIDs');
                        }
                }

diff --git a/wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php b/wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php
index a699708306c311273d5c7f126c9b9e8b96bd24f6..f8bfc47628756ab275c6fda726d6416c1fcae0e6 100644 (file)
--- a/wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php
+++ b/wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php
@@ -277,7 +277,7 @@ class UserClipboardAction extends AbstractClipboardAction {
                $userIDs = [];
                foreach ($this->objects as $user) {
                        /** @var User $user */
-                       if ($user->requiresEmailActivation()) $userIDs[] = $user->userID;
+                       if ($user->canEmailConfirm()) $userIDs[] = $user->userID;
                }
                
                return $userIDs;