mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-29 14:48:53 +00:00
fix for bug #14165... hopefully
git-svn-id: file:///svn/phpbb/trunk@8057 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
23e3766497
commit
72a904c500
2 changed files with 10 additions and 6 deletions
|
@ -2293,8 +2293,10 @@ function login_forum_box($forum_data)
|
||||||
if ($password)
|
if ($password)
|
||||||
{
|
{
|
||||||
// Remove expired authorised sessions
|
// Remove expired authorised sessions
|
||||||
$sql = 'SELECT session_id
|
$sql = 'SELECT f.session_id
|
||||||
FROM ' . SESSIONS_TABLE;
|
FROM ' . FORUMS_ACCESS_TABLE . ' f
|
||||||
|
LEFT JOIN ' . SESSIONS_TABLE . ' s ON (f.session_id = s.session_id)
|
||||||
|
WHERE s.session_id IS NULL';
|
||||||
$result = $db->sql_query($sql);
|
$result = $db->sql_query($sql);
|
||||||
|
|
||||||
if ($row = $db->sql_fetchrow($result))
|
if ($row = $db->sql_fetchrow($result))
|
||||||
|
@ -2308,7 +2310,7 @@ function login_forum_box($forum_data)
|
||||||
|
|
||||||
// Remove expired sessions
|
// Remove expired sessions
|
||||||
$sql = 'DELETE FROM ' . FORUMS_ACCESS_TABLE . '
|
$sql = 'DELETE FROM ' . FORUMS_ACCESS_TABLE . '
|
||||||
WHERE ' . $db->sql_in_set('session_id', $sql_in, true);
|
WHERE ' . $db->sql_in_set('session_id', $sql_in);
|
||||||
$db->sql_query($sql);
|
$db->sql_query($sql);
|
||||||
}
|
}
|
||||||
$db->sql_freeresult($result);
|
$db->sql_freeresult($result);
|
||||||
|
|
|
@ -427,8 +427,10 @@ class ucp_register
|
||||||
$str = '';
|
$str = '';
|
||||||
if (!$change_lang)
|
if (!$change_lang)
|
||||||
{
|
{
|
||||||
$sql = 'SELECT session_id
|
$sql = 'SELECT c.session_id
|
||||||
FROM ' . SESSIONS_TABLE;
|
FROM ' . CONFIRM_TABLE . ' c
|
||||||
|
LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id)
|
||||||
|
WHERE s.session_id IS NULL';
|
||||||
$result = $db->sql_query($sql);
|
$result = $db->sql_query($sql);
|
||||||
|
|
||||||
if ($row = $db->sql_fetchrow($result))
|
if ($row = $db->sql_fetchrow($result))
|
||||||
|
@ -443,7 +445,7 @@ class ucp_register
|
||||||
if (sizeof($sql_in))
|
if (sizeof($sql_in))
|
||||||
{
|
{
|
||||||
$sql = 'DELETE FROM ' . CONFIRM_TABLE . '
|
$sql = 'DELETE FROM ' . CONFIRM_TABLE . '
|
||||||
WHERE ' . $db->sql_in_set('session_id', $sql_in, true) . '
|
WHERE ' . $db->sql_in_set('session_id', $sql_in) . '
|
||||||
AND confirm_type = ' . CONFIRM_REG;
|
AND confirm_type = ' . CONFIRM_REG;
|
||||||
$db->sql_query($sql);
|
$db->sql_query($sql);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue