Fixed user search issue

diff --git a/com.woltlab.wcf/templates/selectOptionType.tpl b/com.woltlab.wcf/templates/selectOptionType.tpl
index 3ddf5f984d9656ad767a56351ab758d9f436fcd6..98d1893d64dfe99da641acd0f7cc6b94808dbfbe 100644 (file)
--- a/com.woltlab.wcf/templates/selectOptionType.tpl
+++ b/com.woltlab.wcf/templates/selectOptionType.tpl
@@ -1,5 +1,5 @@
 <select id="{$option->optionName}" name="values[{$option->optionName}]">
-       {if $option->allowEmptyValue}<option value="">{lang}wcf.global.noSelection{/lang}</option>{/if}
+       {if $allowEmptyValue}<option value="">{lang}wcf.global.noSelection{/lang}</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/acp/templates/selectOptionType.tpl b/wcfsetup/install/files/acp/templates/selectOptionType.tpl
index 3ddf5f984d9656ad767a56351ab758d9f436fcd6..98d1893d64dfe99da641acd0f7cc6b94808dbfbe 100644 (file)
--- a/wcfsetup/install/files/acp/templates/selectOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/selectOptionType.tpl
@@ -1,5 +1,5 @@
 <select id="{$option->optionName}" name="values[{$option->optionName}]">
-       {if $option->allowEmptyValue}<option value="">{lang}wcf.global.noSelection{/lang}</option>{/if}
+       {if $allowEmptyValue}<option value="">{lang}wcf.global.noSelection{/lang}</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/system/option/SelectOptionType.class.php b/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php
index 6ecd3b4e32dcca990e98e1116957b9720751bc75..98f540b6d7a9b2da0ec70e22310f6fdb29b53828 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php
@@ -14,6 +14,8 @@ use wcf\system\WCF;
  * @category   Community Framework
  */
 class SelectOptionType extends RadioButtonOptionType {
+       protected $allowEmptyValue = false; 
+       
        /**
         * @see \wcf\system\option\IOptionType::getFormElement()
         */
@@ -26,7 +28,8 @@ class SelectOptionType extends RadioButtonOptionType {
                        'enableOptions' => $options['enableOptions'],
                        'option' => $option,
                        'selectOptions' => $option->parseSelectOptions(),
-                       'value' => $value
+                       'value' => $value,
+                       'allowEmptyValue' => ($this->allowEmptyValue || $option->allowEmptyValue)
                ));
                return WCF::getTPL()->fetch('selectOptionType');
        }
@@ -35,6 +38,7 @@ class SelectOptionType extends RadioButtonOptionType {
         * @see \wcf\system\option\ISearchableUserOption::getSearchFormElement()
         */
        public function getSearchFormElement(Option $option, $value) {
+               $this->allowEmptyValue = true;
                return $this->getFormElement($option, $value);
        }