From: joshuaruesweg <ruesweg@woltlab.com>
Date: Sun, 5 Jul 2020 08:42:10 +0000 (+0200)
Subject: Always confirm email on confirmEmail action
X-Git-Tag: 5.3.0_Alpha_1~157
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=486c39614a51ca12b09015969bc7548c004c1d64;p=GitHub%2FWoltLab%2FWCF.git

Always confirm email on confirmEmail action
---

diff --git a/wcfsetup/install/files/lib/data/user/UserAction.class.php b/wcfsetup/install/files/lib/data/user/UserAction.class.php
index 9eed6f493b..310192b404 100644
--- a/wcfsetup/install/files/lib/data/user/UserAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/UserAction.class.php
@@ -641,14 +641,13 @@ class UserAction extends AbstractDatabaseObjectAction implements IClipboardActio
 	public function confirmEmail() {
 		if (empty($this->objects)) $this->readObjects();
 		
-		if (REGISTER_ACTIVATION_METHOD & User::REGISTER_ACTIVATION_ADMIN) {
-			(new UserAction($this->objects, 'update', [
-				'data' => [
-					'emailConfirmed' => null,
-				]
-			]))->executeAction();
-		}
-		else {
+		(new UserAction($this->objects, 'update', [
+			'data' => [
+				'emailConfirmed' => null,
+			]
+		]))->executeAction();
+		
+		if (!(REGISTER_ACTIVATION_METHOD & User::REGISTER_ACTIVATION_ADMIN)) {
 			$this->enable();
 		}