From 36868b304ad9111aa6f55def5befc214bbc74174 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 16 Feb 2015 19:41:34 +0100
Subject: [PATCH] Fix search form issue for option types

---
 .../files/lib/system/option/MultiSelectOptionType.class.php     | 2 +-
 .../files/lib/system/option/RadioButtonOptionType.class.php     | 2 +-
 .../install/files/lib/system/option/TextOptionType.class.php    | 2 +-
 .../files/lib/system/option/TextareaOptionType.class.php        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php b/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php
index 7e9efe2b93..413f6c8aae 100644
--- 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 d58aea1202..a6275d99a6 100644
--- 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 c2089c1c24..dea48dd298 100644
--- 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 73b55bde42..5c7f19d57a 100644
--- 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');
-- 
2.20.1