summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-08-13 14:52:16 -0700
committerEvan Prodromou <evan@status.net>2010-08-13 14:52:16 -0700
commit341b935acc0111bc2bfa69be5687c4e6f255d8ce (patch)
treee7d6c8a5945175bedc502a67ad34a4644635b79e
parent1dadb8efc04cbb807b2cd8b6291f7c2f64a631dc (diff)
parentae696728f5edf8972c68c17ce9ea21f07d44cbed (diff)
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
-rw-r--r--plugins/Recaptcha/RecaptchaPlugin.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/plugins/Recaptcha/RecaptchaPlugin.php b/plugins/Recaptcha/RecaptchaPlugin.php
index 7cc34c568..b7a0e92c7 100644
--- a/plugins/Recaptcha/RecaptchaPlugin.php
+++ b/plugins/Recaptcha/RecaptchaPlugin.php
@@ -41,7 +41,8 @@ class RecaptchaPlugin extends Plugin
var $failed;
var $ssl;
- function onInitializePlugin(){
+ function onInitializePlugin()
+ {
if(!isset($this->private_key)) {
common_log(LOG_ERR, 'Recaptcha: Must specify private_key in config.php');
}
@@ -50,7 +51,8 @@ class RecaptchaPlugin extends Plugin
}
}
- function checkssl(){
+ function checkssl()
+ {
if(common_config('site', 'ssl') === 'sometimes' || common_config('site', 'ssl') === 'always') {
return true;
}
@@ -102,7 +104,7 @@ class RecaptchaPlugin extends Plugin
if($this->display_errors) {
$action->showForm ("(reCAPTCHA error: " . $resp->error . ")");
}
- $action->showForm("Captcha does not match!");
+ $action->showForm(_m("Captcha does not match!"));
return false;
}
}
@@ -118,4 +120,4 @@ class RecaptchaPlugin extends Plugin
'captcha to the registration page.'));
return true;
}
-}
+} \ No newline at end of file