From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 26 Apr 2013 15:02:11 +0000 (+0200)
Subject: Fixed select user options
X-Git-Tag: 2.0.0_Beta_1~295^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=00e5119924024a692ed401388ca320af4007d9d5;p=GitHub%2FWoltLab%2FWCF.git

Fixed select user options
---

diff --git a/com.woltlab.wcf/template/selectOptionType.tpl b/com.woltlab.wcf/template/selectOptionType.tpl
index 25332e39d2..e0e2ce6cdf 100644
--- a/com.woltlab.wcf/template/selectOptionType.tpl
+++ b/com.woltlab.wcf/template/selectOptionType.tpl
@@ -1,5 +1,5 @@
 <select id="{$option->optionName}" name="values[{$option->optionName}]">
-	<option value=""></option>
+	{if $option->allowEmptyValue}<option value=""></option>{/if}
 	{foreach from=$selectOptions key=key item=selectOption}
 		<option value="{$key}"{if $value == $key} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
 	{/foreach}
diff --git a/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php
index 93342d07b9..229c32543e 100644
--- a/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php
@@ -232,7 +232,8 @@ class UserOptionAddForm extends AbstractForm {
 			'searchable' => $this->searchable,
 			'editable' => $this->editable,
 			'visible' => $this->visible,
-			'packageID' => 1
+			'packageID' => 1,
+			'additionalData' => ($this->optionType == 'select' ? serialize(array('allowEmptyValue' => true)) : '')
 		)));
 		$this->objectAction->executeAction();