* Code conventions - spacing, minor refactoring

* Correct errant release note

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 399355e..9e80cea 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -122,8 +122,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 10438) HTML TeX formulas should not wrap
 * Introduce "raw editing" mode for the watchlist, to allow bulk additions,
   removals, and convenient exporting of watchlist contents
-* Put an (undo) button on the page history page, for people with rollback
-  permission only
+* Show "undo" links in page histories
 * Option to jump to specified time period in user contributions
 
 == Bugfixes since 1.10 ==

diff --git a/includes/PageHistory.php b/includes/PageHistory.php
index a89b75b..2b57d66 100644 (file)
--- a/includes/PageHistory.php
+++ b/includes/PageHistory.php
@@ -248,12 +248,13 @@ class PageHistory {
                        $s .= ' '.$this->mSkin->generateRollback( $rev );
                }
 
-               if ( !is_null($next)) {
+               if ( !is_null( $next ) ) {
                        $undolink = $this->mSkin->makeKnownLinkObj(
-                               $this->mTitle, '('.htmlspecialchars( wfMsg( 'editundo' ) ).')',
-                               'action=edit&undoafter=' . $next->rev_id . '&undo=' . $rev->getId(),
-                               '', '', '', null );
-                       $s .= ' <span class="mw-history-undo"> '."$undolink </span>";
+                               $this->mTitle,
+                               '(' . wfMsgHtml( 'editundo' ) . ')',
+                               'action=edit&undoafter=' . $next->rev_id . '&undo=' . $rev->getId()
+                       );
+                       $s .= " <span class=\"mw-history-undo\">{$undolink}</span>";
                }
                
                wfRunHooks( 'PageHistoryLineEnding', array( &$row , &$s ) );