Fixed recaptcha module setting

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 9d6a4f5dcce449971cdf475afb536bbfff7ff44c..166f22131155f9eb8680bd07665c0ce9137617b3 100644 (file)
--- 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 3728bdded61d5c195c742b7c6837439d4f2d494e..4bf1bdf410cae90f7122ecb9b3e82a24ee7d011e 100644 (file)
--- 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;
                }
        }