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/phpbb/session.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/phpbb/session.php')
| -rw-r--r-- | phpBB/phpbb/session.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 5a0d7c0031..7d564742af 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -962,7 +962,7 @@ class session */ function session_gc() { - global $db, $config, $phpbb_root_path, $phpEx; + global $db, $config, $phpbb_root_path, $phpEx, $phpbb_container; $batch_size = 10; @@ -1022,11 +1022,7 @@ class session } // only called from CRON; should be a safe workaround until the infrastructure gets going - if (!class_exists('phpbb_captcha_factory', false)) - { - include($phpbb_root_path . "includes/captcha/captcha_factory." . $phpEx); - } - $captcha_factory = new \phpbb_captcha_factory(); + $captcha_factory = $phpbb_container->get('captcha.factory'); $captcha_factory->garbage_collect($config['captcha_plugin']); $sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . ' |