* (bug 6365) Show user information in the "old revision" navigation links

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 49d023c..ffaf9f3 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -526,7 +526,7 @@ Some default configuration options have changed:
 * Vertically align current version with old version header in diff display
 * (bug 6174) Remove redundant "emailforlost" message 
 * (bug 6189) Show an error to an unprivilleged user trying to create account
-
+* (bug 6365) Show user information in the "old revision" navigation links
 
 == Compatibility ==
 

diff --git a/includes/Article.php b/includes/Article.php
index 567755e..b58dda3 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -2220,6 +2220,8 @@ class Article {
        function setOldSubtitle( $oldid=0 ) {
                global $wgLang, $wgOut, $wgUser;
 
+               $revision = Revision::newFromId( $oldid );
+
                $current = ( $oldid == $this->mLatest );
                $td = $wgLang->timeanddate( $this->mTimestamp, true );
                $sk = $wgUser->getSkin();
@@ -2233,7 +2235,11 @@ class Article {
                $nextlink = $current
                        ? wfMsg( 'nextrevision' )
                        : $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'nextrevision' ), 'direction=next&oldid='.$oldid );
-               $r = wfMsg( 'revisionasofwithlink', $td, $lnk, $prevlink, $nextlink );
+               
+               $userlinks = $sk->userLink( $revision->getUser(), $revision->getUserText() )
+                                               . $sk->userToolLinks( $revision->getUser(), $revision->getUserText() );
+               
+               $r = wfMsg( 'oldrevisionnavigation', $td, $lnk, $prevlink, $nextlink, $userlinks );
                $wgOut->setSubtitle( $r );
        }
 

diff --git a/languages/Messages.php b/languages/Messages.php
index 3e716d0..7899457 100644 (file)
--- a/languages/Messages.php
+++ b/languages/Messages.php
@@ -566,10 +566,10 @@ Please check the URL you used to access this page.",
 'loadhist'             => 'Loading page history',
 'currentrev'   => 'Current revision',
 'revisionasof'          => 'Revision as of $1',
-'revisionasofwithlink'  => 'Revision as of $1; $2<br />$3 | $4',
+'oldrevisionnavigation' => 'Revision as of $1; $5<br />$3 | $2 | $4',
 'previousrevision'     => '←Older revision',
 'nextrevision'         => 'Newer revision→',
-'currentrevisionlink'   => 'view current revision',
+'currentrevisionlink'   => 'Current revision',
 'cur'                  => 'cur',
 'next'                 => 'next',
 'last'                 => 'last',