diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-10-30 18:19:44 -0400 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-10-30 18:19:44 -0400 |
| commit | 1f248dab6f9413a67f08e008b36c9fc64489d1ce (patch) | |
| tree | 8e5c4e91baa1e23dca3bef30fd33942bca06ab90 /phpBB/includes/acp/acp_captcha.php | |
| parent | e0e3622ba9571e7fd2ab5d86e4544d9757c0ac5d (diff) | |
| parent | d602f13d7f6ba7ee67a5286befd8afd9f8f0cd15 (diff) | |
| download | forums-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/acp/acp_captcha.php')
| -rw-r--r-- | phpBB/includes/acp/acp_captcha.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php index 51b5dd3301..c7c64ae56b 100644 --- a/phpBB/includes/acp/acp_captcha.php +++ b/phpBB/includes/acp/acp_captcha.php @@ -29,7 +29,8 @@ class acp_captcha $user->add_lang('acp/board'); include($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx); - $captchas = phpbb_captcha_factory::get_captcha_types(); + $factory = new phpbb_captcha_factory(); + $captchas = $factory->get_captcha_types(); $selected = request_var('select_captcha', $config['captcha_plugin']); $selected = (isset($captchas['available'][$selected]) || isset($captchas['unavailable'][$selected])) ? $selected : $config['captcha_plugin']; |