diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-07-30 01:06:11 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-30 01:06:11 +0200 |
| commit | 91392c728826c38fd625a80c4e855d373b6866e1 (patch) | |
| tree | 96b25a8d6198ef058cc32cd78f81ed0ebbc294b5 /phpBB/phpbb/session.php | |
| parent | 5f3f41d6d6fb5c997ab7b70482fef542a5534b6a (diff) | |
| parent | 09de06cf15071fd88a1bf3554007aab2a4faadf4 (diff) | |
| download | forums-91392c728826c38fd625a80c4e855d373b6866e1.tar forums-91392c728826c38fd625a80c4e855d373b6866e1.tar.gz forums-91392c728826c38fd625a80c4e855d373b6866e1.tar.bz2 forums-91392c728826c38fd625a80c4e855d373b6866e1.tar.xz forums-91392c728826c38fd625a80c4e855d373b6866e1.zip | |
Merge remote-tracking branch 'phpbb/develop' into ticket/11574
* phpbb/develop: (130 commits)
[ticket/11638] Changed the layout to match the other similar commits
[ticket/11640] removed the space that I wonder what it was doing there.
[ticket/11749] Move event after all template data has been defined
[ticket/10917] Variable used only once so delete it
[ticket/10917] Revert use of phpbb wrapper
[ticket/11749] Template events for topic_list_row_pre/append
[ticket/11749] PHP Events for viewforum.php
[ticket/11749] PHP Events for search.php
[ticket/11740] Update FAQ to include Ideas Centre
[ticket/11062] If user's language is english there is no further work needed
[ticket/11062] Load new strings from user's language file if provided
[ticket/10917] Using phpbb wrapper
[ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
[ticket/11741] Fix empty brackets and remove bullet
[ticket/11638] Removed the unneeded reset.
[ticket/11638] Use the $parse_flags like the other commits
[ticket/11638] Reverted to use the $parse tags way as the other ones
[ticket/11638] Updated: bitwise $parse_flags use optionset()
[ticket/11656] Made the check for the bitfield just like other PR's
[ticket/11667] Use @inheritdoc
...
Diffstat (limited to 'phpBB/phpbb/session.php')
| -rw-r--r-- | phpBB/phpbb/session.php | 3 |
1 files changed, 2 insertions, 1 deletions
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']); |