diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-08-11 12:20:35 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-08-11 12:20:35 +0200 |
| commit | 91df95a90dd3266f4beeb7df7534f75882909581 (patch) | |
| tree | 4aa78d8abf67a08571dd7421251d104415dd2bf4 /phpBB/includes/functions.php | |
| parent | c10c6bd34297afbf6b32f5047a85c33fa546c23d (diff) | |
| parent | 756aa68b34e8584c7e010b2295ff63e485be1907 (diff) | |
| download | forums-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/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index dcdaf684c0..c838876ddd 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2751,11 +2751,6 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa global $db, $user, $template, $auth, $phpEx, $phpbb_root_path, $config; global $request, $phpbb_container; - if (!class_exists('phpbb_captcha_factory', false)) - { - include($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx); - } - $err = ''; // Make sure user->setup() has been called @@ -2865,7 +2860,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa { 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); // $captcha->reset(); |