From 27fda7446fa3c9abf0b3ff462cf9aa6cf91abf6e Mon Sep 17 00:00:00 2001 From: Domas Mituzas Date: Fri, 11 Jun 2004 15:16:00 +0000 Subject: [PATCH] don't use OR on empty variables --- includes/Block.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/includes/Block.php b/includes/Block.php index c830ccdc45..e8a53e0efd 100644 --- a/includes/Block.php +++ b/includes/Block.php @@ -43,13 +43,17 @@ class Block } # Get a ban from the DB, with either the given address or the given username - function load( $address, $user = 0, $killExpired = true ) + function load( $address = "", $user = 0, $killExpired = true ) { $fname = 'Block::load'; $ret = false; $killed = false; - if ( 0 == $user ) { + if ( 0 == $user && $address=="" ) { + $sql = "SELECT * from ipblocks"; + } elseif ($address=="") { + $sql = "SELECT * FROM ipblocks WHERE ipb_user={$user}"; + } elseif ($user=="") { $sql = "SELECT * FROM ipblocks WHERE ipb_address='" . wfStrencode( $address ) . "'"; } else { $sql = "SELECT * FROM ipblocks WHERE (ipb_address='" . wfStrencode( $address ) . -- 2.20.1