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

[ticket/11854] Rename captchas.factory service to captcha.factory

Browse Source 
PHPBB3-11854
This commit is contained in:
Tristan Darricau
2014-08-09 15:57:01 +02:00
parent d73d606f11
commit b91abf1a0b
10 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/acp/acp_captcha.php
View File

@@ -30,7 +30,7 @@ class acp_captcha
$user->add_lang('acp/board');
$factory = $phpbb_container->get('captchas.factory');
$factory = $phpbb_container->get('captcha.factory');
$captchas = $factory->get_captcha_types();
$selected = request_var('select_captcha', $config['captcha_plugin']);
@@ -138,7 +138,7 @@ class acp_captcha
{
global $db, $user, $config, $phpbb_container;
$captcha = $phpbb_container->get('captchas.factory')->get_instance($selected);
$captcha = $phpbb_container->get('captcha.factory')->get_instance($selected);
$captcha->init(CONFIRM_REG);
$captcha->execute_demo();

2
phpBB/includes/functions.php
View File

@@ -2839,7 +2839,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
{
case LOGIN_ERROR_ATTEMPTS:
$captcha = $phpbb_container->get('captchas.factory')->get_instance($config['captcha_plugin']);
$captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
$captcha->init(CONFIRM_LOGIN);
// $captcha->reset();

2
phpBB/includes/ucp/ucp_confirm.php
View File

@@ -38,7 +38,7 @@ class ucp_confirm
{
global $db, $user, $phpbb_root_path, $config, $phpEx, $phpbb_container;
$captcha = $phpbb_container->get('captchas.factory')->get_instance($config['captcha_plugin']);
$captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
$captcha->init(request_var('type', 0));
$captcha->execute();

2
phpBB/includes/ucp/ucp_login_link.php
View File

@@ -197,7 +197,7 @@ class ucp_login_link
{
case LOGIN_ERROR_ATTEMPTS:
$captcha = $phpbb_container->get('captchas.factory')->get_instance($config['captcha_plugin']);
$captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
$captcha->init(CONFIRM_LOGIN);
$template->assign_vars(array(

2
phpBB/includes/ucp/ucp_register.php
View File

@@ -182,7 +182,7 @@ class ucp_register
// The CAPTCHA kicks in here. We can't help that the information gets lost on language change.
if ($config['enable_confirm'])
{
$captcha = $phpbb_container->get('captchas.factory')->get_instance($config['captcha_plugin']);
$captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
$captcha->init(CONFIRM_REG);
}