From: Rob Church <robchurch@users.mediawiki.org>
Date: Tue, 20 Jun 2006 15:19:13 +0000 (+0000)
Subject: * (bug 6365) Show user information in the "old revision" navigation links
X-Git-Tag: 1.31.0-rc.0~56722
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=fbe77e927a152a666b0c76a2f205fa3c8dbf5881;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 49d023c858..ffaf9f3b89 100644
--- 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 567755e071..b58dda3fca 100644
--- 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 3e716d0704..789945732a 100644
--- 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',