From: joshuaruesweg <ruesweg@woltlab.com>
Date: Thu, 18 Jun 2020 08:22:00 +0000 (+0200)
Subject: Allow resending activation mails for users w/o a confirmed email
X-Git-Tag: 5.3.0_Alpha_1~182^2~6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cbb77ee79b05dce58f6e49f423901d8e0bd2bdf6;p=GitHub%2FWoltLab%2FWCF.git

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 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;