* (bug 2971) Swap links of hist & diff location on Special:Contributions for consiste...

Now RC/WL incl. enhanced versions and Contributions have the same order of 'diff' and 'hist' links.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bee3cad..1ec94a3 100644 (file)
--- 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 05b00eb..e5994f4 100644 (file)
--- 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 ) ) {