Reverted r35829, breaks the suppression of the "next diff" link ("newer edit" on...

diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index 52133eb..e74e4c7 100644 (file)
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -206,8 +206,12 @@ CONTROL;
 
                $prevlink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'previousdiff' ),
                        'diff=prev&oldid='.$this->mOldid, '', '', 'id="differences-prevlink"' );
-               $nextlink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'nextdiff' ),
-                       'diff=next&oldid='.$this->mNewid, '', '', 'id="differences-nextlink"' );
+               if ( $this->mNewRev->isCurrent() ) {
+                       $nextlink = ' ';
+               } else {
+                       $nextlink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'nextdiff' ),
+                               'diff=next&oldid='.$this->mNewid, '', '', 'id="differences-nextlink"' );
+               }
 
                $oldminor = '';
                $newminor = '';
@@ -670,7 +674,7 @@ CONTROL;
                $timestamp = $wgLang->timeanddate( $this->mNewRev->getTimestamp(), true );
                $this->mNewPage = $this->mNewRev->getTitle();
                if( $this->mNewRev->isCurrent() ) {
-                       $newLink = $this->mNewPage->escapeLocalUrl( 'oldid=' . $this->mNewid );
+                       $newLink = $this->mNewPage->escapeLocalUrl();
                        $this->mPagetitle = htmlspecialchars( wfMsg( 'currentrev' ) );
                        $newEdit = $this->mNewPage->escapeLocalUrl( 'action=edit' );