* (bug 11728) Unify layout of enhanced watchlist/recent changes:

Changed from:
  Time  Page (4 changes) . . (+bytes) . . (hist) [list of editors]
To:
  Time  Page (4 changes; hist) . . (+bytes) . . [list of editors]

Use consistent message for the history link
Patch by Mormegil

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0a1e360..2abbdf8 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -356,6 +356,7 @@ The following extensions are migrated into MediaWiki 1.14:
   installations.
 * Improved scripting safety heuristics for IE 5/6 content-type detection.
 * Improved scripting safety heuristics on SVG uploads.
+* (bug 11728) Unify layout of enhanced watchlist/recent changes
 
 === API changes in 1.14 ===
 

diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index 7cdd2d0..6b0a049 100644 (file)
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -692,9 +692,19 @@ class EnhancedChangesList extends ChangesList {
                                $r .= $this->skin->makeKnownLinkObj( $block[0]->getTitle(),
                                        $nchanges[$n], $curIdEq."&diff=$currentRevision&oldid=$oldid" );
                        }
-                       $r .= ') . . ';
                }
 
+               # History
+               if( $alllogs ) {
+                       // don't show history link for logs
+               } else if( $namehidden || !$block[0]->getTitle()->exists() ) {
+                       $r .= $this->message['semicolon-separator'] . $this->message['hist'] . ')';
+               } else {
+                       $r .= $this->message['semicolon-separator'] . $this->skin->makeKnownLinkObj( $block[0]->getTitle(),
+                               $this->message['hist'], $curIdEq . '&action=history' ) . ')';
+               }
+               $r .= ' . . ';
+
                # Character difference (does not apply if only log items)
                if( $wgRCShowChangedSize && !$alllogs ) {
                        $last = 0;
@@ -717,16 +727,6 @@ class EnhancedChangesList extends ChangesList {
                        }
                }
 
-               # History
-               if( $alllogs ) {
-                       // don't show history link for logs
-               } else if( $namehidden || !$block[0]->getTitle()->exists() ) {
-                       $r .= '(' . $this->message['history'] . ')';
-               } else {
-                       $r .= '(' . $this->skin->makeKnownLinkObj( $block[0]->getTitle(),
-                               $this->message['history'], $curIdEq.'&action=history' ) . ')';
-               }
-
                $r .= $users;
                $r .= $this->numberofWatchingusers($block[0]->numberofWatchingusers);
 
@@ -892,7 +892,7 @@ class EnhancedChangesList extends ChangesList {
 
                # Character diff
                if( $wgRCShowChangedSize ) {
-                       $r .= ( $rcObj->getCharacterDifference() == '' ? '' : ' ' . $rcObj->getCharacterDifference() . ' . . ' ) ;
+                       $r .= ( $rcObj->getCharacterDifference() == '' ? '' : $rcObj->getCharacterDifference() . ' . . ' ) ;
                }
 
                # User/talk