(bug 2562) Show rollback link for current revisions on diff pages

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9a954dd..53e3f01 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -406,6 +406,7 @@ Various bugfixes, small features, and a few experimental things:
   status between next/previous buttons.
 * Move MonoBook printable link from tab to sidebar
 * (bug 2567) Fix HTML escaping on category titles in list
+* (bug 2562) Show rollback link for current revisions on diff pages
 
 
 === Caveats ===

diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index c6f58d2..42df967 100644 (file)
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -152,7 +152,7 @@ CONTROL;
                        'target=' . urlencode($this->mOldUser) );
                $newContribs = $sk->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Contributions' ), $contribs,
                        'target=' . urlencode($this->mNewUser) );
-               if ( !$this->mNewid && $wgUser->isAllowed('rollback') ) {
+               if ( $this->newRev->isCurrent() && $wgUser->isAllowed('rollback') ) {
                        $rollback = '&nbsp;&nbsp;&nbsp;<strong>[' . $sk->makeKnownLinkObj( $wgTitle, wfMsg( 'rollbacklink' ),
                                'action=rollback&from=' . urlencode($this->mNewUser) .
                                '&token=' . urlencode( $wgUser->editToken( array( $wgTitle->getPrefixedText(), $this->mNewUser ) ) ) ) .