From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 2 Jun 2013 14:13:24 +0000 (+0200)
Subject: Fixed recaptcha module setting
X-Git-Tag: 2.0.0_Beta_3~50
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f37f7bc6e5fb0f5c8ee73de94886970381111f44;p=GitHub%2FWoltLab%2FWCF.git

Fixed recaptcha module setting
---

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 9d6a4f5dcc..166f221311 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -144,6 +144,7 @@
 				</category>
 					<category name="security.antispam.recaptcha">
 						<parent>security.antispam</parent>
+						<options>module_system_recaptcha</options>
 					</category>
 				
 				<category name="security.censorship">
@@ -803,16 +804,19 @@ no:!cache_source_memcached_host]]></enableoptions>
 				<categoryname>security.antispam</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue><![CDATA[1]]></defaultvalue>
+				<options>module_system_recaptcha</options>
 			</option>
 			<option name="lost_password_use_captcha">
 				<categoryname>security.antispam</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue><![CDATA[1]]></defaultvalue>
+				<options>module_system_recaptcha</options>
 			</option>
 			<option name="profile_mail_use_captcha">
 				<categoryname>security.antispam</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue><![CDATA[1]]></defaultvalue>
+				<options>module_system_recaptcha</options>
 			</option>
 			<!-- /user.security -->
 			
@@ -1035,6 +1039,7 @@ DESC:wcf.global.sortOrder.descending]]></selectoptions>
 			<option name="search_use_captcha">
 				<categoryname>security.antispam</categoryname>
 				<optiontype>boolean</optiontype>
+				<options>module_system_recaptcha</options>
 			</option>
 			
 			<option name="search_default_sort_field">
diff --git a/wcfsetup/install/files/lib/form/RecaptchaForm.class.php b/wcfsetup/install/files/lib/form/RecaptchaForm.class.php
index 3728bdded6..4bf1bdf410 100644
--- a/wcfsetup/install/files/lib/form/RecaptchaForm.class.php
+++ b/wcfsetup/install/files/lib/form/RecaptchaForm.class.php
@@ -39,7 +39,7 @@ abstract class RecaptchaForm extends AbstractForm {
 	public function readParameters() {
 		parent::readParameters();
 		
-		if (WCF::getUser()->userID || WCF::getSession()->getVar('recaptchaDone')) {
+		if (!MODULE_SYSTEM_RECAPTCHA || WCF::getUser()->userID || WCF::getSession()->getVar('recaptchaDone')) {
 			$this->useCaptcha = false;
 		}
 	}