From 531a5dd5ee29be436e3ff1a976a82d9b7a205fd7 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Wed, 14 Mar 2007 01:45:28 +0000
Subject: [PATCH] *Fix initialization regressions in r20382. Also, join on
 block table to hide hidden names

---
 includes/SpecialListusers.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/includes/SpecialListusers.php b/includes/SpecialListusers.php
index 2f321939b4..8a05c38001 100644
--- a/includes/SpecialListusers.php
+++ b/includes/SpecialListusers.php
@@ -40,6 +40,7 @@ class UsersPager extends AlphabeticPager {
 		global $wgRequest;
 		$this->requestedGroup = $group != "" ? $group : $wgRequest->getVal( 'group' );
 		$un = $wgRequest->getText( 'username' );
+		$this->requestedUser = '';
 		if ( $un != '' ) {
 			$username = Title::makeTitleSafe( NS_USER, $un );
 			$this->requestedUser = $username->getText();
@@ -54,6 +55,8 @@ class UsersPager extends AlphabeticPager {
 
 	function getQueryInfo() {
 		$conds=array();
+		// don't show hidden names
+		$conds[]='ipb_deleted IS NULL OR ipb_deleted = 0';
 		if ($this->requestedGroup != "") {
 			$conds['ug_group'] = $this->requestedGroup;
 		}
@@ -61,17 +64,18 @@ class UsersPager extends AlphabeticPager {
 			$conds[] = 'user_name >= ' . wfGetDB()->addQuotes( $this->requestedUser );
 		}
 
-		list ($user,$user_groups) = wfGetDB()->tableNamesN('user','user_groups');
+		list ($user,$user_groups,$ipblocks) = wfGetDB()->tableNamesN('user','user_groups','ipblocks');
 
 		return array(
-			'tables' => " $user LEFT JOIN $user_groups ON user_id=ug_user ",
+			'tables' => " $user LEFT JOIN $user_groups ON user_id=ug_user LEFT JOIN $ipblocks ON user_id=ipb_user AND ipb_auto=0 ",
 			'fields' => array('user_name',
 				'MAX(user_id) AS user_id',
 				'COUNT(ug_group) AS numgroups', 
 				'MAX(ug_group) AS singlegroup'),
 			'options' => array('GROUP BY' => 'user_name'), 
 			'conds' => $conds
-		);
+		);	
+		
 	}
 
 	function formatRow($row) {
@@ -144,8 +148,7 @@ class UsersPager extends AlphabeticPager {
 		$groups = User::getAllGroups();
 		foreach( $groups as $group ) {
 			$attribs = array( 'value' => $group );
-			if( $group == $this->requestedGroup )
-				$attribs['selected'] = 'selected';
+			$attribs['selected'] = ( $group == $this->requestedGroup ) ? 'selected' : '';
 			$out .= Xml::option( User::getGroupName( $group ), $attribs['value'], $attribs['selected'] );
 		}
 		$out .= Xml::closeElement( 'select' ) . ' ';
-- 
2.20.1