Fix tag search if no tag is entered

See #2689

diff --git a/com.woltlab.wcf/templates/tagSearch.tpl b/com.woltlab.wcf/templates/tagSearch.tpl
index b824483ca2c3239988437b3a2166bf68ad0ad006..39833b9438e0ffedd65b948af598622a0ea86f93 100644 (file)
--- a/com.woltlab.wcf/templates/tagSearch.tpl
+++ b/com.woltlab.wcf/templates/tagSearch.tpl
@@ -25,6 +25,15 @@
                                        <dt><label for="tagSearchInput">{lang}wcf.tagging.tags{/lang}</label></dt>
                                        <dd>
                                                <input id="tagSearchInput" type="text" value="" class="long">
+                                               {if $errorField === 'tags'}
+                                                       <small class="innerError">
+                                                               {if $errorType == 'empty'}
+                                                                       {lang}wcf.global.form.error.empty{/lang}
+                                                               {else}
+                                                                       {lang}wcf.tagging.tags.error.{$errorType}{/lang}
+                                                               {/if}
+                                                       </small>
+                                               {/if}
                                                <small>{lang}wcf.tagging.tags.description{/lang}</small>
                                        </dd>
                                </dl>

diff --git a/wcfsetup/install/files/lib/form/TagSearchForm.class.php b/wcfsetup/install/files/lib/form/TagSearchForm.class.php
index 8595798e03eac4a1dacd903efb0f7e11a2390f01..acc7d6b18b5bc1e3d483b7c136da6b233b961daf 100644 (file)
--- a/wcfsetup/install/files/lib/form/TagSearchForm.class.php
+++ b/wcfsetup/install/files/lib/form/TagSearchForm.class.php
@@ -82,8 +82,13 @@ class TagSearchForm extends AbstractCaptchaForm {
                        }
                }
                
-               $this->tags = TagEngine::getInstance()->getTagsByName($this->tagNames, $this->languageID);
-               if (empty($this->tags)) {
+               if (!empty($this->tagNames)) {
+                       $this->tags = TagEngine::getInstance()->getTagsByName($this->tagNames, $this->languageID);
+                       if (empty($this->tags)) {
+                               throw new UserInputException('tags');
+                       }
+               }
+               else {
                        throw new UserInputException('tags');
                }
        }