mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/11620] Fix a static calls to non-static for session captcha

Browse Source 
These changes fixes an error in certain version of php that throws
an error if you call a non-static method statically.

PHPBB3-11620
This commit is contained in:
asperous
2013-07-13 08:38:02 -07:00
committed by Andy Chase
parent 25b189d33b
commit de2cb59533
2 changed files with 4 additions and 2 deletions
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);
}
call_user_func(array($name, 'garbage_collect'), 0);
$captcha = new $name;
$captcha->garbage_collect('');
}
/**

3
phpBB/includes/session.php
View File

@@ -1016,7 +1016,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']);