From: Thalia <thalia.e.chan@googlemail.com>
Date: Fri, 23 Nov 2018 15:56:42 +0000 (+0000)
Subject: Don't indicate partial blocks on Special:ListUsers
X-Git-Tag: 1.34.0-rc.0~3421^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22calendrier%22%2C%22type=semaine%22%29%20.%20%22?a=commitdiff_plain;h=36eed95b9a198e867e092cd21617d66c9c18bae9;p=lhc%2Fweb%2Fwiklou.git

Don't indicate partial blocks on Special:ListUsers

Only indicate that a user is blocked if their block
is sitewide.

Bug:T208276
Change-Id: Iee032a126bf1a7a2aa1049196b79a9e269d83243
---

diff --git a/includes/specials/pagers/UsersPager.php b/includes/specials/pagers/UsersPager.php
index bc24d26a16..fbf179d126 100644
--- a/includes/specials/pagers/UsersPager.php
+++ b/includes/specials/pagers/UsersPager.php
@@ -142,7 +142,8 @@ class UsersPager extends AlphabeticPager {
 				'user_id' => $this->creationSort ? 'user_id' : 'MAX(user_id)',
 				'edits' => 'MAX(user_editcount)',
 				'creation' => 'MIN(user_registration)',
-				'ipb_deleted' => 'MAX(ipb_deleted)' // block/hide status
+				'ipb_deleted' => 'MAX(ipb_deleted)', // block/hide status
+				'ipb_sitewide' => 'MAX(ipb_sitewide)'
 			],
 			'options' => $options,
 			'join_conds' => [
@@ -214,7 +215,8 @@ class UsersPager extends AlphabeticPager {
 			$created = $this->msg( 'usercreated', $d, $t, $row->user_name )->escaped();
 			$created = ' ' . $this->msg( 'parentheses' )->rawParams( $created )->escaped();
 		}
-		$blocked = !is_null( $row->ipb_deleted ) ?
+
+		$blocked = !is_null( $row->ipb_deleted ) && $row->ipb_sitewide === '1' ?
 			' ' . $this->msg( 'listusers-blocked', $userName )->escaped() :
 			'';