makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 04:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'asperous/ticket/11731' into develop

Browse source 
* asperous/ticket/11731:
  [ticket/11731] Remove static calls to captcha garbage collector
This commit is contained in:
Andreas Fischer 2013-07-23 00:07:38 +02:00
commit c2d919f12d
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/includes/captcha/captcha_factory.php
View file

@ -50,7 +50,8 @@ class phpbb_captcha_factory
{ {
include($phpbb_root_path . "includes/captcha/plugins/{$name}_plugin." . $phpEx); 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);
} }
/** /**

3
phpBB/phpbb/session.php
View file

@ -1022,7 +1022,8 @@ class phpbb_session
{ {
include($phpbb_root_path . "includes/captcha/captcha_factory." . $phpEx); 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 . ' $sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . '
WHERE attempt_time < ' . (time() - (int) $config['ip_login_limit_time']); WHERE attempt_time < ' . (time() - (int) $config['ip_login_limit_time']);