From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 15 Feb 2020 14:52:07 +0000 (+0100)
Subject: UserFormField returned no values if required flag was set
X-Git-Tag: 5.2.3~25
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2f4ef5691ead601810a61cee6128c31b4f4ea88b;p=GitHub%2FWoltLab%2FWCF.git

UserFormField returned no values if required flag was set
---

diff --git a/wcfsetup/install/files/lib/system/form/builder/field/user/UserFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/user/UserFormField.class.php
index e1b34c1919..530d5146b7 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/user/UserFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/user/UserFormField.class.php
@@ -129,63 +129,62 @@ class UserFormField extends AbstractFormField implements IAutoFocusFormField, II
 		) {
 			$this->addValidationError(new FormFieldValidationError('empty'));
 		}
-		else if (!$this->isRequired()) {
-			if ($this->allowsMultiple()) {
-				if ($this->getMinimumMultiples() > 0 && count($this->getValue()) < $this->getMinimumMultiples()) {
-					$this->addValidationError(new FormFieldValidationError(
-						'minimumMultiples',
-						'wcf.form.field.user.error.minimumMultiples',
-						[
-							'minimumCount' => $this->getMinimumMultiples(),
-							'count' => count($this->getValue())
-						]
-					));
-				}
-				else if ($this->getMaximumMultiples() !== IMultipleFormField::NO_MAXIMUM_MULTIPLES && count($this->getValue()) > $this->getMaximumMultiples()) {
-					$this->addValidationError(new FormFieldValidationError(
-						'maximumMultiples',
-						'wcf.form.field.user.error.maximumMultiples',
-						[
-							'maximumCount' => $this->getMaximumMultiples(),
-							'count' => count($this->getValue())
-						]
-					));
-				}
-				else {
-					// validate users
-					$this->users = UserProfile::getUserProfilesByUsername($this->getValue());
-					
-					$nonExistentUsernames = [];
-					foreach ($this->getValue() as $username) {
-						if (!isset($this->users[$username])) {
-							$nonExistentUsernames[] = $username;
-						}
-					}
-					
-					if (!empty($nonExistentUsernames)) {
-						$this->addValidationError(new FormFieldValidationError(
-							'nonExistent',
-							'wcf.form.field.user.error.nonExistent',
-							['nonExistentUsernames' => $nonExistentUsernames]
-						));
+		
+		if ($this->allowsMultiple()) {
+			if ($this->getMinimumMultiples() > 0 && count($this->getValue()) < $this->getMinimumMultiples()) {
+				$this->addValidationError(new FormFieldValidationError(
+					'minimumMultiples',
+					'wcf.form.field.user.error.minimumMultiples',
+					[
+						'minimumCount' => $this->getMinimumMultiples(),
+						'count' => count($this->getValue())
+					]
+				));
+			}
+			else if ($this->getMaximumMultiples() !== IMultipleFormField::NO_MAXIMUM_MULTIPLES && count($this->getValue()) > $this->getMaximumMultiples()) {
+				$this->addValidationError(new FormFieldValidationError(
+					'maximumMultiples',
+					'wcf.form.field.user.error.maximumMultiples',
+					[
+						'maximumCount' => $this->getMaximumMultiples(),
+						'count' => count($this->getValue())
+					]
+				));
+			}
+			else {
+				// validate users
+				$this->users = UserProfile::getUserProfilesByUsername($this->getValue());
+				
+				$nonExistentUsernames = [];
+				foreach ($this->getValue() as $username) {
+					if (!isset($this->users[$username])) {
+						$nonExistentUsernames[] = $username;
 					}
 				}
-			}
-			else if ($this->getValue() !== '') {
-				$user = UserProfile::getUserProfileByUsername($this->getValue());
 				
-				if ($user === null) {
+				if (!empty($nonExistentUsernames)) {
 					$this->addValidationError(new FormFieldValidationError(
 						'nonExistent',
-						'wcf.form.field.user.error.invalid'
+						'wcf.form.field.user.error.nonExistent',
+						['nonExistentUsernames' => $nonExistentUsernames]
 					));
 				}
-				else {
-					$this->users[] = $user;
-				}
 			}
 		}
-		
+		else if ($this->getValue() !== '') {
+			$user = UserProfile::getUserProfileByUsername($this->getValue());
+			
+			if ($user === null) {
+				$this->addValidationError(new FormFieldValidationError(
+					'nonExistent',
+					'wcf.form.field.user.error.invalid'
+				));
+			}
+			else {
+				$this->users[] = $user;
+			}
+		}
+				
 		parent::validate();
 	}