// is done in two queries to avoid huge quicksorts and to make COUNT(*) correct.
$dbr = $this->getDatabase();
$res = $dbr->select( 'ipblocks',
- [ 'ipb_user', 'MAX(ipb_deleted) AS block_status' ],
+ [ 'ipb_user', 'MAX(ipb_deleted) AS deleted, MAX(ipb_sitewide) AS sitewide' ],
[ 'ipb_user' => $uids ],
__METHOD__,
[ 'GROUP BY' => [ 'ipb_user' ] ]
);
$this->blockStatusByUid = [];
foreach ( $res as $row ) {
- $this->blockStatusByUid[$row->ipb_user] = $row->block_status; // 0 or 1
+ $this->blockStatusByUid[$row->ipb_user] = [
+ 'deleted' => $row->deleted,
+ 'sitewide' => $row->sitewide,
+ ];
}
$this->mResult->seek( 0 );
}
$item = $lang->specialList( $ulinks, $groups );
+ // If there is a block, 'deleted' and 'sitewide' are both set on
+ // $this->blockStatusByUid[$row->user_id].
+ $blocked = '';
$isBlocked = isset( $this->blockStatusByUid[$row->user_id] );
- if ( $isBlocked && $this->blockStatusByUid[$row->user_id] == 1 ) {
- $item = "<span class=\"deleted\">$item</span>";
+ if ( $isBlocked ) {
+ if ( $this->blockStatusByUid[$row->user_id]['deleted'] == 1 ) {
+ $item = "<span class=\"deleted\">$item</span>";
+ }
+ if ( $this->blockStatusByUid[$row->user_id]['sitewide'] == 1 ) {
+ $blocked = ' ' . $this->msg( 'listusers-blocked', $userName )->escaped();
+ }
}
$count = $this->msg( 'activeusers-count' )->numParams( $row->recentedits )
->params( $userName )->numParams( $this->RCMaxAge )->escaped();
- $blocked = $isBlocked ? ' ' . $this->msg( 'listusers-blocked', $userName )->escaped() : '';
return Html::rawElement( 'li', [], "{$item} [{$count}]{$blocked}" );
}