From 9070b061ee6c3ccd2ee8fa4988e57f63acc0f5fc Mon Sep 17 00:00:00 2001 From: Fredrick Brennan Date: Sat, 20 Sep 2014 15:20:00 +0000 Subject: [PATCH] Bug fix: users were banned from /0/ if they had a ban anywhere else Conflicts: inc/bans.php --- inc/bans.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/inc/bans.php b/inc/bans.php index d5225e95..c5132ef3 100644 --- a/inc/bans.php +++ b/inc/bans.php @@ -122,13 +122,13 @@ class Bans { $query = prepare('SELECT ``bans``.*' . ($get_mod_info ? ', `username`' : '') . ' FROM ``bans`` ' . ($get_mod_info ? 'LEFT JOIN ``mods`` ON ``mods``.`id` = `creator`' : '') . ' - WHERE - (' . ($board ? '(`board` IS NULL OR `board` = :board) AND' : '') . ' - (`ipstart` = :ip OR (:ip >= `ipstart` AND :ip <= `ipend`))) + WHERE ' . ($id ? 'id = :id' : ' + (' . ($board !== false ? '(`board` IS NULL OR `board` = :board) AND' : '') . ' + (`ipstart` = :ip OR (:ip >= `ipstart` AND :ip <= `ipend`)))') . ' ORDER BY `expires` IS NULL, `expires` DESC'); - if ($board) - $query->bindValue(':board', $board); + if ($board !== false) + $query->bindValue(':board', $board, PDO::PARAM_STR); $query->bindValue(':ip', inet_pton($ip)); $query->execute() or error(db_error($query));