From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Tue, 24 Feb 2009 23:17:08 +0000 (+0000)
Subject: Bug 17241 The diffonly URI parameter should cascade to "Next edit" and "Previous... 
X-Git-Tag: 1.31.0-rc.0~42692
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=b99b87750810c6826fbc8a7dedf58f13c1985fa5;p=lhc%2Fweb%2Fwiklou.git

Bug 17241 The diffonly URI parameter should cascade to "Next edit" and "Previous edit" diff links
---

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index ad57cdc2de..975ecea54e 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -208,14 +208,21 @@ CONTROL;
 			$patrol = '';
 		}
 
+		$diffOnlyArg = '';
+		# Carry over 'diffonly' param via navigation links
+		if( $diffOnly != $wgUser->getBoolOption('diffonly') ) {
+			$diffOnlyArg = '&diffonly='.$diffOnly;
+		}
 		$htmldiffarg = $this->htmlDiffArgument();
+		# Make "previous revision link"
 		$prevlink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'previousdiff' ),
-			'diff=prev&oldid='.$this->mOldid.$htmldiffarg, '', '', 'id="differences-prevlink"' );
-		if ( $this->mNewRev->isCurrent() ) {
+			"diff=prev&oldid={$this->mOldid}{$htmldiffarg}{$diffOnlyArg}", '', '', 'id="differences-prevlink"' );
+		# Make "next revision link"
+		if( $this->mNewRev->isCurrent() ) {
 			$nextlink = '&nbsp;';
 		} else {
 			$nextlink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'nextdiff' ),
-				'diff=next&oldid='.$this->mNewid.$htmldiffarg, '', '', 'id="differences-nextlink"' );
+				"diff=next&oldid={$this->mNewid}{$htmldiffarg}{$diffOnlyArg}", '', '', 'id="differences-nextlink"' );
 		}
 
 		$oldminor = '';