mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'p/ticket/11157' into develop

Browse Source 
* 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.
This commit is contained in:
Andreas Fischer
2012-10-30 18:19:44 -04:00
parent e0e3622ba9 d602f13d7f
commit 1f248dab6f
6 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
View File

@@ -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,