Fix search form issue for option types

diff --git a/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php b/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php
index 7e9efe2b93e08920c9e6739cde863db76d9942f6..413f6c8aae8b9aee83bb08ae1582b0f9f5a86a18 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php
@@ -49,7 +49,7 @@ class MultiSelectOptionType extends SelectOptionType {
        public function getSearchFormElement(Option $option, $value) {
                WCF::getTPL()->assign(array(
                        'option' => $option,
-                       'searchOption' => $value !== $option->defaultValue || isset($_POST['searchOptions'][$option->optionName]),
+                       'searchOption' => $value !== null && ($value !== $option->defaultValue || isset($_POST['searchOptions'][$option->optionName])),
                        'selectOptions' => $this->getSelectOptions($option),
                        'value' => (!is_array($value) ? explode("\n", $value) : $value)
                ));

diff --git a/wcfsetup/install/files/lib/system/option/RadioButtonOptionType.class.php b/wcfsetup/install/files/lib/system/option/RadioButtonOptionType.class.php
index d58aea1202851c341e3f2bc88c6c34e4b6fa0a0a..a6275d99a6fe3368c72d4356bfcb3c0a6c9e7def 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/RadioButtonOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/RadioButtonOptionType.class.php
@@ -69,7 +69,7 @@ class RadioButtonOptionType extends AbstractOptionType implements ISearchableCon
         */
        public function getSearchFormElement(Option $option, $value) {
                $this->templateName = 'radioButtonSearchableOptionType';
-               WCF::getTPL()->assign('searchOption', $value !== $option->defaultValue || isset($_POST['searchOptions'][$option->optionName]));
+               WCF::getTPL()->assign('searchOption', $value !== null && ($value !== $option->defaultValue || isset($_POST['searchOptions'][$option->optionName])));
                
                return $this->getFormElement($option, $value);
        }

diff --git a/wcfsetup/install/files/lib/system/option/TextOptionType.class.php b/wcfsetup/install/files/lib/system/option/TextOptionType.class.php
index c2089c1c24d4578a4599a9c11998840a3f352c51..dea48dd298cfdba6921c2faa203d291a50c526ce 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/TextOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/TextOptionType.class.php
@@ -52,7 +52,7 @@ class TextOptionType extends AbstractOptionType implements ISearchableConditionU
                        'option' => $option,
                        'inputType' => $this->inputType,
                        'inputClass' => $this->inputClass,
-                       'searchOption' => $value !== $option->defaultValue || isset($_POST['searchOptions'][$option->optionName]),
+                       'searchOption' => $value !== null && ($value !== $option->defaultValue || isset($_POST['searchOptions'][$option->optionName])),
                        'value' => $value
                ));
                return WCF::getTPL()->fetch('textSearchableOptionType');

diff --git a/wcfsetup/install/files/lib/system/option/TextareaOptionType.class.php b/wcfsetup/install/files/lib/system/option/TextareaOptionType.class.php
index 73b55bde4250bf603c54a707c5981ed68d8642ab..5c7f19d57a7125a5731de28f90506a238edac8d9 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/TextareaOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/TextareaOptionType.class.php
@@ -32,7 +32,7 @@ class TextareaOptionType extends TextOptionType {
        public function getSearchFormElement(Option $option, $value) {
                WCF::getTPL()->assign(array(
                        'option' => $option,
-                       'searchOption' => $value !== $option->defaultValue || isset($_POST['searchOptions'][$option->optionName]),
+                       'searchOption' => $value !== null && ($value !== $option->defaultValue || isset($_POST['searchOptions'][$option->optionName])),
                        'value' => $value
                ));
                return WCF::getTPL()->fetch('textareaSearchableOptionType');