From 7d19b08c2c5d320918d0c544fafe2fdb7d0284b8 Mon Sep 17 00:00:00 2001
From: Tobias <churchofemacs@users.mediawiki.org>
Date: Fri, 19 Feb 2010 10:37:20 +0000
Subject: [PATCH] LogExtract on blocked user's pages: fixing r62241 (see
 comments by Tim)

---
 includes/Article.php              | 12 ++++++------
 includes/EditPage.php             | 12 ++++++------
 languages/messages/MessagesEn.php |  2 ++
 maintenance/language/messages.inc |  1 +
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/includes/Article.php b/includes/Article.php
index c49b290142..17922b05bd 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1212,23 +1212,23 @@ class Article {
 		if ( $this->mTitle->getNamespace() == NS_USER || $this->mTitle->getNamespace() == NS_USER_TALK ) {
 			$parts = explode( '/', $this->mTitle->getText() );
 			$rootPart = $parts[0];
-			$id = User::idFromName( $rootPart );
+			$user = User::newFromName( $rootPart, false /* allow IP users*/ );
 			$ip = User::isIP( $rootPart );
-			if ( $id == 0 && !$ip ) { # User does not exist
+			if ( !$user->isLoggedIn() && !$ip ) { # User does not exist
 				$wgOut->wrapWikiMsg( "<div class=\"mw-userpage-userdoesnotexist error\">\n\$1</div>",
 					array( 'userpage-userdoesnotexist-view', $rootPart ) );
-			} else if ( User::newFromId( $id )->isBlocked() ) { # Show log extract if the user is currently blocked
+			} else if ( $user->isBlocked() ) { # Show log extract if the user is currently blocked
 				LogEventsList::showLogExtract(
 					$wgOut,
 					'block',
-					$this->mTitle->getSubjectPage()->getPrefixedText(),
+					$user->getUserPage()->getPrefixedText(),
 					'',
 					array(
 						'lim' => 1,
 						'showIfEmpty' => false,
 						'msgKey' => array(
-							'sp-contributions-blocked-notice',
-							$this->mTitle->getSubjectPage()->getPrefixedText() # Support GENDER in notice
+							'blocked-notice-logextract',
+							$user->getName() # Support GENDER in notice
 						)
 					)
 				);
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 2d9c2ffd1c..02b06ec03b 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -779,23 +779,23 @@ class EditPage {
 		if ( $namespace == NS_USER || $namespace == NS_USER_TALK ) {
 			$parts = explode( '/', $this->mTitle->getText(), 2 );
 			$username = $parts[0];
-			$id = User::idFromName( $username );
+			$user = User::newFromName( $username, false /* allow IP users*/ );
 			$ip = User::isIP( $username );
-			if ( $id == 0 && !$ip ) { # User does not exist
+			if ( !$user->isLoggedIn() && !$ip ) { # User does not exist
 				$wgOut->wrapWikiMsg( "<div class=\"mw-userpage-userdoesnotexist error\">\n$1</div>",
 					array( 'userpage-userdoesnotexist', $username ) );
-			} else if (User::newFromId($id)->isBlocked()) { # Show log extract if the user is currently blocked
+			} else if ( $user->isBlocked() ) { # Show log extract if the user is currently blocked
 				LogEventsList::showLogExtract(
 					$wgOut,
 					'block',
-					$this->mTitle->getSubjectPage()->getPrefixedText(),
+					$user->getUserPage()->getPrefixedText(),
 					'',
 					array(
 						'lim' => 1,
 						'showIfEmpty' => false,
 						'msgKey' => array(
-							'sp-contributions-blocked-notice',
-							$this->mTitle->getSubjectPage()->getPrefixedText() # Support GENDER in notice
+							'blocked-notice-logextract',
+							$user->getName() # Support GENDER in notice
 						)
 					)
 				);
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index e3643f2f5e..a8a9c9895f 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1264,6 +1264,8 @@ or <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}}
 'userpage-userdoesnotexist'        => 'User account "$1" is not registered.
 Please check if you want to create/edit this page.',
 'userpage-userdoesnotexist-view'   => 'User account "$1" is not registered.',
+'blocked-notice-logextract'        => 'This user is currently blocked.
+The latest block log entry is provided below for reference:',
 'clearyourcache'                   => "'''Note: After saving, you may have to bypass your browser's cache to see the changes.'''
 '''Mozilla / Firefox / Safari:''' hold ''Shift'' while clicking ''Reload'', or press either ''Ctrl-F5'' or ''Ctrl-R'' (''Command-R'' on a Macintosh);
 '''Konqueror: '''click ''Reload'' or press ''F5'';
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 702605ea4a..0333c426a6 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -548,6 +548,7 @@ $wgMessageStructure = array(
 		'noarticletextanon',
 		'userpage-userdoesnotexist',
 		'userpage-userdoesnotexist-view',
+		'blocked-notice-logextract',
 		'clearyourcache',
 		'usercssyoucanpreview',
 		'userjsyoucanpreview',
-- 
2.20.1