diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-07-23 00:07:38 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-07-23 00:07:38 +0200 |
| commit | c2d919f12d82b4c9c19f170f0c69c9b64d06f855 (patch) | |
| tree | e3a363ef0043fcc1481e9a4c5c0ac5cfef260ef7 | |
| parent | 73ae52d057e5f5c0cd1e21b20027a34d8e650752 (diff) | |
| parent | 80f81dd0d2d4aaef0b9c770d6071526aaca79e06 (diff) | |
| download | forums-c2d919f12d82b4c9c19f170f0c69c9b64d06f855.tar forums-c2d919f12d82b4c9c19f170f0c69c9b64d06f855.tar.gz forums-c2d919f12d82b4c9c19f170f0c69c9b64d06f855.tar.bz2 forums-c2d919f12d82b4c9c19f170f0c69c9b64d06f855.tar.xz forums-c2d919f12d82b4c9c19f170f0c69c9b64d06f855.zip | |
Merge remote-tracking branch 'asperous/ticket/11731' into develop
* asperous/ticket/11731:
[ticket/11731] Remove static calls to captcha garbage collector
| -rw-r--r-- | phpBB/includes/captcha/captcha_factory.php | 3 | ||||
| -rw-r--r-- | phpBB/phpbb/session.php | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/captcha/captcha_factory.php b/phpBB/includes/captcha/captcha_factory.php index 1ed8e119b5..fac45087e3 100644 --- a/phpBB/includes/captcha/captcha_factory.php +++ b/phpBB/includes/captcha/captcha_factory.php @@ -50,7 +50,8 @@ class phpbb_captcha_factory { include($phpbb_root_path . "includes/captcha/plugins/{$name}_plugin." . $phpEx); } - call_user_func(array($name, 'garbage_collect'), 0); + $captcha = self::get_instance($name); + $captcha->garbage_collect(0); } /** diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index e0585b1523..dc33786666 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -1022,7 +1022,8 @@ class phpbb_session { include($phpbb_root_path . "includes/captcha/captcha_factory." . $phpEx); } - phpbb_captcha_factory::garbage_collect($config['captcha_plugin']); + $captcha_factory = new phpbb_captcha_factory(); + $captcha_factory->garbage_collect($config['captcha_plugin']); $sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . ' WHERE attempt_time < ' . (time() - (int) $config['ip_login_limit_time']); |