Index: trunk/phase3/maintenance/language/messages.inc
===================================================================
--- trunk/phase3/maintenance/language/messages.inc (revision 43102)
+++ trunk/phase3/maintenance/language/messages.inc (revision 43103)
@@ -55,6 +55,7 @@
'tog-diffonly',
'tog-showhiddencats',
'tog-noconvertlink',
+ 'tog-norollbackdiff',
),
'underline' => array(
'underline-always',
Index: trunk/phase3/includes/User.php
===================================================================
--- trunk/phase3/includes/User.php (revision 43102)
+++ trunk/phase3/includes/User.php (revision 43103)
@@ -91,6 +91,7 @@
'diffonly',
'showhiddencats',
'noconvertlink',
+ 'norollbackdiff',
);
/**
Index: trunk/phase3/includes/Article.php
===================================================================
--- trunk/phase3/includes/Article.php (revision 43102)
+++ trunk/phase3/includes/Article.php (revision 43103)
@@ -2733,7 +2733,7 @@
$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( '', '' );
}
Index: trunk/phase3/includes/specials/SpecialPreferences.php
===================================================================
--- trunk/phase3/includes/specials/SpecialPreferences.php (revision 43102)
+++ trunk/phase3/includes/specials/SpecialPreferences.php (revision 43103)
@@ -1005,9 +1005,13 @@
'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>' );
Index: trunk/phase3/languages/messages/MessagesEn.php
===================================================================
--- trunk/phase3/languages/messages/MessagesEn.php (revision 43102)
+++ trunk/phase3/languages/messages/MessagesEn.php (revision 43103)
@@ -542,6 +542,7 @@
'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',
Index: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES (revision 43102)
+++ trunk/phase3/RELEASE-NOTES (revision 43103)
@@ -190,6 +190,7 @@
* 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 ===
