From c77fb1bb5f08394a9e978c2622fbf474c6530b91 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 4 Dec 2011 13:42:00 +0100
Subject: [PATCH] Fixes bug in AbstractOptionListForm::validate()

Forms that extend AbstractOptionListForm validate first, but their entries in the errorType property are overwritten by the option handler's errors.
---
 .../install/files/lib/acp/form/AbstractOptionListForm.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wcfsetup/install/files/lib/acp/form/AbstractOptionListForm.class.php b/wcfsetup/install/files/lib/acp/form/AbstractOptionListForm.class.php
index f4d36d38ba..732a440f53 100755
--- a/wcfsetup/install/files/lib/acp/form/AbstractOptionListForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/AbstractOptionListForm.class.php
@@ -97,7 +97,7 @@ abstract class AbstractOptionListForm extends AbstractForm {
 	public function validate() {
 		parent::validate();
 		
-		$this->errorType = $this->optionHandler->validate();
+		$this->errorType = array_merge($this->optionHandler->validate(), $this->errorType);
 		
 		if (count($this->errorType) > 0) {
 			throw new UserInputException('options', $this->errorType);
-- 
2.20.1