mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 18:26:32 +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

10
phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
View File

@@ -108,7 +108,7 @@ class phpbb_captcha_qa
/**
* See if the captcha has created its tables.
*/
function is_installed()
static public function is_installed()
{
global $db, $phpbb_root_path, $phpEx;
@@ -124,14 +124,14 @@ class phpbb_captcha_qa
/**
* API function - for the captcha to be available, it must have installed itself and there has to be at least one question in the board's default lang
*/
function is_available()
static public function is_available()
{
global $config, $db, $phpbb_root_path, $phpEx, $user;
// load language file for pretty display in the ACP dropdown
$user->add_lang('captcha_qa');
if (!phpbb_captcha_qa::is_installed())
if (!self::is_installed())
{
return false;
}
@@ -157,7 +157,7 @@ class phpbb_captcha_qa
/**
* API function
*/
function get_name()
static public function get_name()
{
return 'CAPTCHA_QA';
}
@@ -612,7 +612,7 @@ class phpbb_captcha_qa
$user->add_lang('acp/board');
$user->add_lang('captcha_qa');
if (!$this->is_installed())
if (!self::is_installed())
{
$this->install();
}