From 5fd152f7dc43d8f11a0c3b21948c325728be5fd4 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Sun, 2 Nov 2008 23:44:18 +0000
Subject: [PATCH] (bug 15761) Add user toggle to omit diff after rollback.
 Patch by FunPika.

---
 RELEASE-NOTES                            | 1 +
 includes/Article.php                     | 2 +-
 includes/User.php                        | 1 +
 includes/specials/SpecialPreferences.php | 8 ++++++--
 languages/messages/MessagesEn.php        | 1 +
 maintenance/language/messages.inc        | 1 +
 6 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 257d4e987b..ef80d6a8a1 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -190,6 +190,7 @@ The following extensions are migrated into MediaWiki 1.14:
 * Set a special temporary directory for ImageMagick with $wgImageMagickTempDir
 * (bug 16113) Show/hide for redirects in Special:NewPages
 * (bug 15903) Upload link was added to Nostalgia skin
+* (bug 15761) Add user toggle to omit diff after rollback
 
 === Bug fixes in 1.14 ===
 
diff --git a/includes/Article.php b/includes/Article.php
index 0e6d123bdc..1884f4f696 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -2733,7 +2733,7 @@ class Article {
 		$wgOut->addHtml( wfMsgExt( 'rollback-success', array( 'parse', 'replaceafter' ), $old, $new ) );
 		$wgOut->returnToMain( false, $this->mTitle );
 
-		if( !$wgRequest->getBool( 'hidediff', false ) ) {
+		if( !$wgRequest->getBool( 'hidediff', false ) && !$wgUser->getBoolOption( 'norollbackdiff', false ) ) {
 			$de = new DifferenceEngine( $this->mTitle, $current->getId(), $newId, false, true );
 			$de->showDiff( '', '' );
 		}
diff --git a/includes/User.php b/includes/User.php
index 00dcb4f8c1..898a9f34d1 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -91,6 +91,7 @@ class User {
 		'diffonly',
 		'showhiddencats',
 		'noconvertlink',
+		'norollbackdiff',
 	);
 
 	/**
diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index d7fec6f57e..b5349e762f 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -1005,8 +1005,12 @@ class PreferencesForm {
 				'externaldiff',
 				$wgLivePreview ? 'uselivepreview' : false,
 				'forceeditsummary',
-			) ) . '</fieldset>'
-		);
+			) ) );
+		
+                if( $wgUser->isAllowed( 'rollback' ) )
+			$wgOut->addHtml( $this->getToggle( 'norollbackdiff' ) );
+
+		$wgOut->addHtml( '</fieldset>' );
 
 		# Recent changes
 		$wgOut->addHtml( '<fieldset><legend>' . wfMsgHtml( 'prefs-rc' ) . '</legend>' );
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index cb4cb2f3db..2809bb8dbd 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -542,6 +542,7 @@ XHTML id names.
 'tog-diffonly'                => 'Do not show page content below diffs',
 'tog-showhiddencats'          => 'Show hidden categories',
 'tog-noconvertlink'           => 'Disable link title conversion', # only translate this message to other languages if you have to change it
+'tog-norollbackdiff'          => 'Omit diff after performing a rollback.',
 
 'underline-always'  => 'Always',
 'underline-never'   => 'Never',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index c0b2b66045..e3afdede38 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -55,6 +55,7 @@ $wgMessageStructure = array(
 		'tog-diffonly',
 		'tog-showhiddencats',
 		'tog-noconvertlink',
+		'tog-norollbackdiff',
 	),
 	'underline' => array(
 		'underline-always',
-- 
2.20.1