(bug 15761) Add user toggle to omit diff after rollback. Patch by FunPika.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 257d4e9..ef80d6a 100644 (file)
--- 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 0e6d123..1884f4f 100644 (file)
--- 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 00dcb4f..898a9f3 100644 (file)
--- 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 d7fec6f..b5349e7 100644 (file)
--- 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 cb4cb2f..2809bb8 100644 (file)
--- 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 c0b2b66..e3afded 100644 (file)
--- 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',