| Index: trunk/phase3/includes/specials/SpecialListusers.php |
| — | — | @@ -74,7 +74,7 @@ |
| 75 | 75 | $dbr = wfGetDB( DB_SLAVE ); |
| 76 | 76 | $conds = array(); |
| 77 | 77 | // Don't show hidden names |
| 78 | | - $conds[] = 'ipb_deleted IS NULL OR ipb_deleted = 0'; |
| | 78 | + $conds[] = 'ipb_deleted IS NULL'; |
| 79 | 79 | if( $this->requestedGroup != '' ) { |
| 80 | 80 | $conds['ug_group'] = $this->requestedGroup; |
| 81 | 81 | $useIndex = ''; |
| — | — | @@ -97,7 +97,7 @@ |
| 98 | 98 | |
| 99 | 99 | $query = array( |
| 100 | 100 | 'tables' => " $user $useIndex LEFT JOIN $user_groups ON user_id=ug_user |
| 101 | | - LEFT JOIN $ipblocks ON user_id=ipb_user AND ipb_auto=0 ", |
| | 101 | + LEFT JOIN $ipblocks ON user_id=ipb_user AND ipb_deleted=1 AND ipb_auto=0 ", |
| 102 | 102 | 'fields' => array( |
| 103 | 103 | $this->creationSort ? 'MAX(user_name) AS user_name' : 'user_name', |
| 104 | 104 | $this->creationSort ? 'user_id' : 'MAX(user_id) AS user_id', |