From cbb77ee79b05dce58f6e49f423901d8e0bd2bdf6 Mon Sep 17 00:00:00 2001 From: joshuaruesweg Date: Thu, 18 Jun 2020 10:22:00 +0200 Subject: [PATCH] Allow resending activation mails for users w/o a confirmed email --- wcfsetup/install/files/lib/data/user/UserAction.class.php | 2 +- .../lib/system/clipboard/action/UserClipboardAction.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wcfsetup/install/files/lib/data/user/UserAction.class.php b/wcfsetup/install/files/lib/data/user/UserAction.class.php index fdca5cf1b0..cda50c2615 100644 --- 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 a699708306..f8bfc47628 100644 --- 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; -- 2.20.1