From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 20 Jan 2017 16:31:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'refs/remotes/origin/2.1'
X-Git-Tag: 3.0.1_pl_1~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8998768b58a8558b0f2f9f4fe0b2b80f0261c868;p=GitHub%2FWoltLab%2FWCF.git

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

8998768b58a8558b0f2f9f4fe0b2b80f0261c868
diff --cc wcfsetup/install/files/lib/form/SearchForm.class.php
index c5d78fdc08,caefdf9fef..e963710f20
--- a/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();
  		}