L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-51217-master' of git://github.com/lucisgit/moodle

Browse Source
This commit is contained in:
David Monllao
2015-09-14 10:04:08 +08:00
parent 3f1bc32d22 7f2033eafe
commit 7426ea3dac
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
auth/email/auth.php
+1 -1
View File
@@ -240,7 +240,7 @@ class auth_plugin_email extends auth_plugin_base {
*/
function is_captcha_enabled() {
global $CFG;
return isset($CFG->recaptchapublickey) && isset($CFG->recaptchaprivatekey) && get_config("auth/{$this->authtype}", 'recaptcha');
return $this->config->recaptcha;
}
}
login/signup_form.php
+2 -1
View File
@@ -192,7 +192,8 @@ class login_signup_form extends moodleform {
*/
function signup_captcha_enabled() {
global $CFG;
return !empty($CFG->recaptchapublickey) && !empty($CFG->recaptchaprivatekey) && get_config('auth/email', 'recaptcha');
$authplugin = get_auth_plugin($CFG->registerauth);
return !empty($CFG->recaptchapublickey) && !empty($CFG->recaptchaprivatekey) && $authplugin->is_captcha_enabled();
}
}