diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-08-09 15:57:01 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-08-11 01:16:22 +0200 |
| commit | b91abf1a0bd751da640219596a94019f70086c0b (patch) | |
| tree | c277cb04b3b31cace50420aa00a3c74af3fd0330 /phpBB/includes | |
| parent | d73d606f11897f13e3779c76261be6f96139f0e0 (diff) | |
| download | forums-b91abf1a0bd751da640219596a94019f70086c0b.tar forums-b91abf1a0bd751da640219596a94019f70086c0b.tar.gz forums-b91abf1a0bd751da640219596a94019f70086c0b.tar.bz2 forums-b91abf1a0bd751da640219596a94019f70086c0b.tar.xz forums-b91abf1a0bd751da640219596a94019f70086c0b.zip | |
[ticket/11854] Rename captchas.factory service to captcha.factory
PHPBB3-11854
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_captcha.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_confirm.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_login_link.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php index 099acf707b..fa8d8fb6a9 100644 --- a/phpBB/includes/acp/acp_captcha.php +++ b/phpBB/includes/acp/acp_captcha.php @@ -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(); diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index d0a32030e3..6cdee825d2 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -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(); diff --git a/phpBB/includes/ucp/ucp_confirm.php b/phpBB/includes/ucp/ucp_confirm.php index 8ade142e2b..7392f8dea8 100644 --- a/phpBB/includes/ucp/ucp_confirm.php +++ b/phpBB/includes/ucp/ucp_confirm.php @@ -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(); diff --git a/phpBB/includes/ucp/ucp_login_link.php b/phpBB/includes/ucp/ucp_login_link.php index 7c768992f7..5ca5df00f7 100644 --- a/phpBB/includes/ucp/ucp_login_link.php +++ b/phpBB/includes/ucp/ucp_login_link.php @@ -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( diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index dbe2233553..a303197563 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -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); } |