aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_login_link.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-08-11 12:20:35 +0200
committerMarc Alexander <admin@m-a-styles.de>2014-08-11 12:20:35 +0200
commit91df95a90dd3266f4beeb7df7534f75882909581 (patch)
tree4aa78d8abf67a08571dd7421251d104415dd2bf4 /phpBB/includes/ucp/ucp_login_link.php
parentc10c6bd34297afbf6b32f5047a85c33fa546c23d (diff)
parent756aa68b34e8584c7e010b2295ff63e485be1907 (diff)
downloadforums-91df95a90dd3266f4beeb7df7534f75882909581.tar
forums-91df95a90dd3266f4beeb7df7534f75882909581.tar.gz
forums-91df95a90dd3266f4beeb7df7534f75882909581.tar.bz2
forums-91df95a90dd3266f4beeb7df7534f75882909581.tar.xz
forums-91df95a90dd3266f4beeb7df7534f75882909581.zip
Merge pull request #2842 from Nicofuma/ticket/11854
[ticket/11854] Move captchas to phpbb/ and use DI for plugins
Diffstat (limited to 'phpBB/includes/ucp/ucp_login_link.php')
-rw-r--r--phpBB/includes/ucp/ucp_login_link.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_login_link.php b/phpBB/includes/ucp/ucp_login_link.php
index a8762313fd..5ca5df00f7 100644
--- a/phpBB/includes/ucp/ucp_login_link.php
+++ b/phpBB/includes/ucp/ucp_login_link.php
@@ -181,7 +181,7 @@ class ucp_login_link
*/
protected function process_login_result($result)
{
- global $config, $request, $template, $user;
+ global $config, $request, $template, $user, $phpbb_container;
$login_error = null;
@@ -197,7 +197,7 @@ class ucp_login_link
{
case LOGIN_ERROR_ATTEMPTS:
- $captcha = phpbb_captcha_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(