aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-10-30 18:19:44 -0400
committerAndreas Fischer <bantu@phpbb.com>2012-10-30 18:19:44 -0400
commit1f248dab6f9413a67f08e008b36c9fc64489d1ce (patch)
tree8e5c4e91baa1e23dca3bef30fd33942bca06ab90 /phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
parente0e3622ba9571e7fd2ab5d86e4544d9757c0ac5d (diff)
parentd602f13d7f6ba7ee67a5286befd8afd9f8f0cd15 (diff)
downloadforums-1f248dab6f9413a67f08e008b36c9fc64489d1ce.tar
forums-1f248dab6f9413a67f08e008b36c9fc64489d1ce.tar.gz
forums-1f248dab6f9413a67f08e008b36c9fc64489d1ce.tar.bz2
forums-1f248dab6f9413a67f08e008b36c9fc64489d1ce.tar.xz
forums-1f248dab6f9413a67f08e008b36c9fc64489d1ce.zip
Merge remote-tracking branch 'p/ticket/11157' into develop
* p/ticket/11157: [ticket/11157] static public is the currently approved order. [ticket/11157] Fix remaining captcha spam. [ticket/11157] get_captcha_types is an instance method.
Diffstat (limited to 'phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php')
-rw-r--r--phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index cdda89eb10..83d40bbba7 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -60,7 +60,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
return $instance;
}
- function is_available()
+ static public function is_available()
{
global $config, $user;
$user->add_lang('captcha_recaptcha');
@@ -75,7 +75,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
return true;
}
- function get_name()
+ static public function get_name()
{
return 'CAPTCHA_RECAPTCHA';
}
@@ -163,7 +163,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
'RECAPTCHA_SERVER' => $this->recaptcha_server,
'RECAPTCHA_PUBKEY' => isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '',
'RECAPTCHA_ERRORGET' => '',
- 'S_RECAPTCHA_AVAILABLE' => $this->is_available(),
+ 'S_RECAPTCHA_AVAILABLE' => self::is_available(),
'S_CONFIRM_CODE' => true,
'S_TYPE' => $this->type,
'L_CONFIRM_EXPLAIN' => $explain,