From 1aeb575ecc58be967b3b96eef02b178df4b198f7 Mon Sep 17 00:00:00 2001
From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Wed, 30 Dec 2009 13:47:23 +0000
Subject: [PATCH] * (bug 2971) Swap links of hist & diff location on
 Special:Contributions for consistency with RC/WL Now RC/WL incl. enhanced
 versions and Contributions have the same order of 'diff' and 'hist' links.

---
 RELEASE-NOTES                              |  2 ++
 includes/specials/SpecialContributions.php | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bee3cadc1a..1ec94a3990 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -669,6 +669,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   previously it sometimes didn't due to caching.
 * (bug 20388) ProfilerSimpleText no longer outputs comment on action=raw
 * refreshLinks.php now purges orphaned redirect table rows
+* (bug 2971) Swap links of hist & diff location on Special:Contributions for
+  consistency with RC/WL
 
 == API changes in 1.16 ==
 
diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 05b00eb51b..e5994f43e5 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -567,7 +567,7 @@ class ContribsPager extends ReverseChronologicalPager {
 		}
 		# Is there a visible previous revision?
 		if( !$rev->isDeleted( Revision::DELETED_TEXT ) && $rev->getParentId() !== 0 ) {
-			$difftext = $this->messages['pipe-separator'] . $sk->linkKnown(
+			$difftext = $sk->linkKnown(
 				$page,
 				$this->messages['diff'],
 				array(),
@@ -575,11 +575,11 @@ class ContribsPager extends ReverseChronologicalPager {
 					'diff' => 'prev',
 					'oldid' => $row->rev_id
 				)
-			) . ')';
+			);
 		} else {
-			$difftext = $this->messages['pipe-separator'] . $this->messages['diff'] . ')';
+			$difftext = $this->messages['diff'];
 		}
-		$histlink = '('.$sk->linkKnown(
+		$histlink = $sk->linkKnown(
 			$page,
 			$this->messages['hist'],
 			array(),
@@ -637,7 +637,8 @@ class ContribsPager extends ReverseChronologicalPager {
 			$del = '';
 		}
 
-		$ret = "{$del}{$d} {$histlink}{$difftext} {$nflag}{$mflag} {$link}{$userlink} {$comment} {$topmarktext}";
+		$diffHistLinks = '(' . $difftext . $this->messages['pipe-separator'] . $histlink . ')';
+		$ret = "{$del}{$d} {$diffHistLinks} {$nflag}{$mflag} {$link}{$userlink} {$comment} {$topmarktext}";
 		
 		# Denote if username is redacted for this edit
 		if( $rev->isDeleted( Revision::DELETED_USER ) ) {
-- 
2.20.1