aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/sessions.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-05-11 11:10:33 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-05-11 11:10:33 +0000
commit7b51bc1dc2256d04bc980ea2063c3a9be79d9310 (patch)
tree3c78b2c0866aa2f3b57c1796c3e30fb4b6a1ad61 /phpBB/includes/sessions.php
parent3fb9761959600c7a471e66b5e3213d3036eadddf (diff)
downloadforums-7b51bc1dc2256d04bc980ea2063c3a9be79d9310.tar
forums-7b51bc1dc2256d04bc980ea2063c3a9be79d9310.tar.gz
forums-7b51bc1dc2256d04bc980ea2063c3a9be79d9310.tar.bz2
forums-7b51bc1dc2256d04bc980ea2063c3a9be79d9310.tar.xz
forums-7b51bc1dc2256d04bc980ea2063c3a9be79d9310.zip
Possible fix for SQL JOIN syntax and MySQL 3.22
git-svn-id: file:///svn/phpbb/trunk@269 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/sessions.php')
-rw-r--r--phpBB/includes/sessions.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/sessions.php b/phpBB/includes/sessions.php
index 5229bc4bf7..3c7e084468 100644
--- a/phpBB/includes/sessions.php
+++ b/phpBB/includes/sessions.php
@@ -225,11 +225,11 @@ function session_pagestart($user_ip, $thispage_id, $session_length)
//
$sql = "SELECT u.*, s.*, b.ban_ip, b.ban_userid
FROM ".SESSIONS_TABLE." s
- LEFT JOIN ".BANLIST_TABLE." b ON ( (b.ban_ip = '$int_ip' OR b.ban_userid = u.user_id)
- AND ( b.ban_start < $current_time AND b.ban_end > $current_time ) )
- LEFT JOIN ".USERS_TABLE." u ON ( u.user_id = s.session_user_id)
+ LEFT JOIN ".BANLIST_TABLE." b ON b.ban_ip = '$int_ip' OR b.ban_userid = u.user_id
+ LEFT JOIN ".USERS_TABLE." u ON u.user_id = s.session_user_id
WHERE s.session_id = '".$sessiondata['sessionid']."'
- AND s.session_ip = '$int_ip'";
+ AND s.session_ip = '$int_ip'
+ AND b.ban_start < $current_time AND b.ban_end > $current_time";
$result = $db->sql_query($sql);
if (!$result)
{