Merge remote-tracking branch 'refs/remotes/origin/2.1'

diff --cc wcfsetup/install/files/lib/form/SearchForm.class.php
index c5d78fdc08d57c8fb9602ba2eb9fe137bf972c40,caefdf9fef61fc1254b1f77cec4bf8959ea1d6ec..e963710f20b8b9e4a18dc3d234c7541f842f074c
--- 1/wcfsetup/install/files/lib/form/SearchForm.class.php
--- 2/wcfsetup/install/files/lib/form/SearchForm.class.php
+++ b/wcfsetup/install/files/lib/form/SearchForm.class.php
@@@ -403,10 -406,10 +403,10 @@@ class SearchForm extends AbstractCaptch
        }
        
        /**
 -       * @see \wcf\page\IPage::show()
 +       * @inheritDoc
         */
        public function show() {
-               if (empty($_POST) && $this->submit) {
+               if (count($_POST) == 1 && $this->submit) {
                        if ($this->userID) $this->useCaptcha = false;
                        $this->submit();
                }