(bug 7688) When viewing diff, section anchors in autosummary jump to section on curre...

[lhc/web/wiklou.git] / includes / DifferenceEngine.php

diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index 21ac558..9adcda5 100644 (file)
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -148,11 +148,7 @@ CONTROL;
                $contribs = wfMsg( 'contribslink' );
 
                if ( $this->mNewRev->isCurrent() && $wgUser->isAllowed('rollback') ) {
-                       $username = $this->mNewRev->getUserText();
-                       $rollback = '&nbsp;&nbsp;&nbsp;<strong>[' . $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'rollbacklink' ),
-                               'action=rollback&from=' . urlencode( $username ) .
-                               '&token=' . urlencode( $wgUser->editToken( array( $this->mTitle->getPrefixedText(), $username ) ) ) ) .
-                               ']</strong>';
+                       $rollback = '&nbsp;&nbsp;&nbsp;' . $sk->generateRollback( $this->mNewRev );
                } else {
                        $rollback = '';
                }
@@ -171,13 +167,26 @@ CONTROL;
                                'diff=next&oldid='.$this->mNewid, '', '', 'id="differences-nextlink"' );
                }
 
+               $oldminor = '';
+               $newminor = '';
+
+               if ($this->mOldRev->mMinorEdit == 1) {
+                       $oldminor = wfElement( 'span', array( 'class' => 'minor' ),
+                               wfMsg( 'minoreditletter') ) . ' ';
+               }
+
+                if ($this->mNewRev->mMinorEdit == 1) {
+                        $newminor = wfElement( 'span', array( 'class' => 'minor' ),
+                               wfMsg( 'minoreditletter') ) . ' ';
+                }
+
                $oldHeader = "<strong>{$this->mOldtitle}</strong><br />" .
                        $sk->revUserTools( $this->mOldRev ) . "<br />" .
-                       $sk->revComment( $this->mOldRev ) . "<br />" .
+                       $oldminor . $sk->revComment( $this->mOldRev ) . "<br />" .
                        $prevlink;
                $newHeader = "<strong>{$this->mNewtitle}</strong><br />" .
                        $sk->revUserTools( $this->mNewRev ) . " $rollback<br />" .
-                       $sk->revComment( $this->mNewRev ) . "<br />" .
+                       $newminor . $sk->revComment( $this->mNewRev, true ) . "<br />" .
                        $nextlink . $patrol;
 
                $this->showDiff( $oldHeader, $newHeader );
@@ -297,7 +306,7 @@ CONTROL;
         * Returns false on error
         */
        function getDiffBody() {
-               global $wgMemc, $wgDBname;
+               global $wgMemc;
                $fname = 'DifferenceEngine::getDiffBody';
                wfProfileIn( $fname );
                
@@ -305,7 +314,7 @@ CONTROL;
                $key = false;
                if ( $this->mOldid && $this->mNewid ) {
                        // Try cache
-                       $key = "$wgDBname:diff:oldid:{$this->mOldid}:newid:{$this->mNewid}";
+                       $key = wfMemcKey( 'diff', 'oldid', $this->mOldid, 'newid', $this->mNewid );
                        $difftext = $wgMemc->get( $key );
                        if ( $difftext ) {
                                wfIncrStats( 'diff_cache_hit' );