LogExtract on blocked user's pages: fixing r62241 (see comments by Tim)

diff --git a/includes/Article.php b/includes/Article.php
index c49b290..17922b0 100644 (file)
--- 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 2d9c2ff..02b06ec 100644 (file)
--- 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 e3643f2..a8a9c98 100644 (file)
--- 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 702605e..0333c42 100644 (file)
--- 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',