saper has uploaded a new change for review. https://gerrit.wikimedia.org/r/92254
Change subject: Don't expose blocked IP address in error message ...................................................................... Don't expose blocked IP address in error message Experimental patch to remove $3 parameter of blockedtext and autoblockedtext Bug: 53008 Change-Id: I4ad917075149616809f65726072f15cc3a5a7a70 --- M includes/Block.php M languages/messages/MessagesEn.php M languages/messages/MessagesQqq.php 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/54/92254/1 diff --git a/includes/Block.php b/includes/Block.php index 34b89e7..05eb509 100644 --- a/includes/Block.php +++ b/includes/Block.php @@ -1424,7 +1424,7 @@ $this->mAuto ? 'autoblockedtext' : 'blockedtext', $link, $reason, - $context->getRequest()->getIP(), + "", $this->getByName(), $this->getId(), $lang->formatExpiry( $this->mExpiry ), diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 0c1b560..4a58312 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1402,7 +1402,7 @@ You can contact $1 or another [[{{MediaWiki:Grouppage-sysop}}|administrator]] to discuss the block. You cannot use the \"email this user\" feature unless a valid email address is specified in your [[Special:Preferences|account preferences]] and you have not been blocked from using it. -Your current IP address is $3, and the block ID is #$5. +Block ID is #$5. Please include all above details in any queries you make.", 'autoblockedtext' => "Your IP address has been automatically blocked because it was used by another user, who was blocked by $1. The reason given is: @@ -1417,7 +1417,7 @@ Note that you may not use the \"email this user\" feature unless you have a valid email address registered in your [[Special:Preferences|user preferences]] and you have not been blocked from using it. -Your current IP address is $3, and the block ID is #$5. +Block ID is #$5. Please include all above details in any queries you make.", 'blockednoreason' => 'no reason given', 'whitelistedittext' => 'You have to $1 to edit pages.', diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php index a8b66b2..f7535ff 100644 --- a/languages/messages/MessagesQqq.php +++ b/languages/messages/MessagesQqq.php @@ -1816,7 +1816,7 @@ Parameters: * $1 - the blocking sysop (with a link to his/her userpage) * $2 - the reason for the block -* $3 - the current IP address of the blocked user +* $3 - empty, do not use * $4 - (Unused) the blocking sysop\'s username (plain text, without the link) * $5 - the unique numeric identifier of the applied autoblock * $6 - the expiry of the block @@ -1832,7 +1832,7 @@ Parameters: * $1 - the blocking sysop (with a link to his/her userpage) * $2 - the reason for the block (in case of autoblocks: {{msg-mw|autoblocker}}) -* $3 - the current IP address of the blocked user +* $3 - empty, do not use * $4 - (Unused) the blocking sysop\'s username (plain text, without the link). Use it for GENDER. * $5 - the unique numeric identifier of the applied autoblock * $6 - the expiry of the block -- To view, visit https://gerrit.wikimedia.org/r/92254 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4ad917075149616809f65726072f15cc3a5a7a70 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: saper <sa...@saper.info> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits