Missing option for the tag search

See #2689

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 25aa93cfbba53bbdaf9dcc681f9dcdd58f4a29db..2b507ac1ac6a7fe9101cca88058b70af6a5a84dd 100644 (file)
--- 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 26303e7cef256f1449ec4d771c4189acc9b2de3a..cfeba96c0a5839ba4dc7fc0b840c4645eede2cff 100644 (file)
--- 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 1f6b549a2cecdc75e45e90a8bc2e6b2753e49d8c..c1a338f5ec64828c1b3eeb968c71676097aec601 100644 (file)
--- 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 4f0bd47df7d0febfed82d264d7d1707d1536c019..4fd437c4e55e60b805bc07352eabe34639ce728c 100644 (file)
--- 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>