Merge branch 'MDL-43632-master' of https://github.com/lucisgit/moodle

2014-01-20 17:10:38 +08:00
parent ae69bab27f 802f85076a
commit 4177d6a097
1 changed files with 9 additions and 1 deletions
@@ -231,9 +231,17 @@ class feedback_item_captcha extends feedback_item_base {
        <a href="javascript:Recaptcha.switch_type(\'image\')">' . $strgetanimagecaptcha . '</a>
        </div>
        </div>';
+
+        // Check if we are using SSL.
+        if (strpos($CFG->wwwroot, 'https://') === 0) {
+            $ssl = true;
+        } else {
+            $ssl = false;
+        }
+
        //we have to rename the challengefield
        if (!empty($CFG->recaptchaprivatekey) AND !empty($CFG->recaptchapublickey)) {
-            $captchahtml = recaptcha_get_html($CFG->recaptchapublickey, null);
+            $captchahtml = recaptcha_get_html($CFG->recaptchapublickey, null, $ssl);
            echo $html.$captchahtml;
        }
    }