From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sun, 5 Apr 2009 02:37:40 +0000 (+0000)
Subject: Clean up ipb_deleted query slightly
X-Git-Tag: 1.31.0-rc.0~42222
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/voir.php?a=commitdiff_plain;h=2c1e4c7a5efa61261c98cb9c0bd4e436a1b936b0;p=lhc%2Fweb%2Fwiklou.git

Clean up ipb_deleted query slightly
---

diff --git a/includes/specials/SpecialListusers.php b/includes/specials/SpecialListusers.php
index aa0578015f..fb8005d937 100644
--- a/includes/specials/SpecialListusers.php
+++ b/includes/specials/SpecialListusers.php
@@ -74,7 +74,7 @@ class UsersPager extends AlphabeticPager {
 		$dbr = wfGetDB( DB_SLAVE );
 		$conds = array();
 		// Don't show hidden names
-		$conds[] = 'ipb_deleted IS NULL OR ipb_deleted = 0';
+		$conds[] = 'ipb_deleted IS NULL';
 		if( $this->requestedGroup != '' ) {
 			$conds['ug_group'] = $this->requestedGroup;
 			$useIndex = '';
@@ -97,7 +97,7 @@ class UsersPager extends AlphabeticPager {
 
 		$query = array(
 			'tables' => " $user $useIndex LEFT JOIN $user_groups ON user_id=ug_user
-				LEFT JOIN $ipblocks ON user_id=ipb_user AND ipb_auto=0 ",
+				LEFT JOIN $ipblocks ON user_id=ipb_user AND ipb_deleted=1 AND ipb_auto=0 ",
 			'fields' => array(
 				$this->creationSort ? 'MAX(user_name) AS user_name' : 'user_name',
 				$this->creationSort ? 'user_id' : 'MAX(user_id) AS user_id',