From 41a02670db189c7f2069d6fb7c4b2d2fbca3d37a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Gerg=C5=91=20Tisza?= <gtisza@wikimedia.org>
Date: Sun, 9 Dec 2018 19:28:09 -0800
Subject: [PATCH] Improve readability of SpecialBlock::checkUnblockSelf

Change-Id: Iaea007f86a5aefe56aaa537e9e77fac0c2a94e37
---
 includes/specials/SpecialBlock.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php
index 78b8f8a934..50ce186ed4 100644
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -1034,18 +1034,20 @@ class SpecialBlock extends FormSpecialPage {
 	 * Exception: Users can block the user who blocked them, to reduce
 	 * advantage of a malicious account blocking all admins (T150826)
 	 *
-	 * @param User|int|string $user Target to block or unblock
+	 * @param User|int|string|null $target Target to block or unblock; could be a User object,
+	 *   or a user ID or username, or null when the target is not known yet (e.g. when
+	 *   displaying Special:Block)
 	 * @param User $performer User doing the request
 	 * @return bool|string True or error message key
 	 */
-	public static function checkUnblockSelf( $user, User $performer ) {
-		if ( is_int( $user ) ) {
-			$user = User::newFromId( $user );
-		} elseif ( is_string( $user ) ) {
-			$user = User::newFromName( $user );
+	public static function checkUnblockSelf( $target, User $performer ) {
+		if ( is_int( $target ) ) {
+			$target = User::newFromId( $target );
+		} elseif ( is_string( $target ) ) {
+			$target = User::newFromName( $target );
 		}
 		if ( $performer->isBlocked() ) {
-			if ( $user instanceof User && $user->getId() == $performer->getId() ) {
+			if ( $target instanceof User && $target->getId() == $performer->getId() ) {
 				# User is trying to unblock themselves
 				if ( $performer->isAllowed( 'unblockself' ) ) {
 					return true;
@@ -1056,10 +1058,10 @@ class SpecialBlock extends FormSpecialPage {
 					return 'ipbnounblockself';
 				}
 			} elseif (
-				$user instanceof User &&
+				$target instanceof User &&
 				$performer->getBlock() instanceof Block &&
 				$performer->getBlock()->getBy() &&
-				$performer->getBlock()->getBy() === $user->getId()
+				$performer->getBlock()->getBy() === $target->getId()
 			) {
 				// Allow users to block the user that blocked them.
 				// This is to prevent a situation where a malicious user
-- 
2.20.1