From d68059b650ed357f8cf791f39f7aced2ae4ad46e Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 4 Jan 2019 12:48:27 +0100
Subject: [PATCH] Missing option for the tag search

See #2689
---
 com.woltlab.wcf/option.xml   | 8 ++++++++
 constants.php                | 1 +
 wcfsetup/install/lang/de.xml | 1 +
 wcfsetup/install/lang/en.xml | 1 +
 4 files changed, 11 insertions(+)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 25aa93cfbb..2b507ac1ac 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -1509,6 +1509,14 @@ username:wcf.search.sortBy.username</selectoptions>
 				<selectoptions>ASC:wcf.global.sortOrder.ascending
 DESC:wcf.global.sortOrder.descending</selectoptions>
 			</option>
+			<option name="search_max_combined_tags">
+				<categoryname>message.search</categoryname>
+				<optiontype>integer</optiontype>
+				<defaultvalue>3</defaultvalue>
+				<options>module_tagging</options>
+				<minvalue>1</minvalue>
+				<maxvalue>10</maxvalue>
+			</option>
 			<!-- message.general.poll -->
 			<option name="poll_max_options">
 				<categoryname>message.general.poll</categoryname>
diff --git a/constants.php b/constants.php
index 26303e7cef..cfeba96c0a 100644
--- a/constants.php
+++ b/constants.php
@@ -250,3 +250,4 @@ define('BREADCRUMBS_HOME_USE_PAGE_TITLE', 1);
 define('CONTACT_FORM_ENABLE_ATTACHMENTS', 0);
 define('CONTACT_FORM_PRUNE_ATTACHMENTS', 180);
 define('IMAGE_EXTERNAL_SOURCE_WHITELIST', '');
+define('SEARCH_MAX_COMBINED_TAGS', 3);
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 1f6b549a2c..c1a338f5ec 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1465,6 +1465,7 @@
 		<item name="wcf.acp.option.search_default_sort_field.description"/>
 		<item name="wcf.acp.option.search_default_sort_order"><![CDATA[Standardreihenfolge]]></item>
 		<item name="wcf.acp.option.search_default_sort_order.description"/>
+		<item name="wcf.acp.option.search_max_combined_tags"><![CDATA[Maximale Anzahl Tags pro Suche]]></item>
 		<item name="wcf.acp.option.category.message.general.poll"><![CDATA[Umfragen]]></item>
 		<item name="wcf.acp.option.module_poll"><![CDATA[Umfragen]]></item>
 		<item name="wcf.acp.option.poll_max_options"><![CDATA[Maximale Anzahl an Antworten]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 4f0bd47df7..4fd437c4e5 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1445,6 +1445,7 @@
 		<item name="wcf.acp.option.search_default_sort_field.description"><![CDATA[Choose default sort option of search results.]]></item>
 		<item name="wcf.acp.option.search_default_sort_order"><![CDATA[Sort Order]]></item>
 		<item name="wcf.acp.option.search_default_sort_order.description"><![CDATA[Choose default sort order of search results.]]></item>
+		<item name="wcf.acp.option.search_max_combined_tags"><![CDATA[Maximum Number of Tags per Search]]></item>
 		<item name="wcf.acp.option.category.message.general.poll"><![CDATA[Polls]]></item>
 		<item name="wcf.acp.option.module_poll"><![CDATA[Polls]]></item>
 		<item name="wcf.acp.option.poll_max_options"><![CDATA[Maximum Poll Options]]></item>
-- 
2.20.1