| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -55,6 +55,7 @@ |
| 56 | 56 | 'tog-diffonly', |
| 57 | 57 | 'tog-showhiddencats', |
| 58 | 58 | 'tog-noconvertlink', |
| | 59 | + 'tog-norollbackdiff', |
| 59 | 60 | ), |
| 60 | 61 | 'underline' => array( |
| 61 | 62 | 'underline-always', |
| Index: trunk/phase3/includes/User.php |
| — | — | @@ -91,6 +91,7 @@ |
| 92 | 92 | 'diffonly', |
| 93 | 93 | 'showhiddencats', |
| 94 | 94 | 'noconvertlink', |
| | 95 | + 'norollbackdiff', |
| 95 | 96 | ); |
| 96 | 97 | |
| 97 | 98 | /** |
| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -2733,7 +2733,7 @@ |
| 2734 | 2734 | $wgOut->addHtml( wfMsgExt( 'rollback-success', array( 'parse', 'replaceafter' ), $old, $new ) ); |
| 2735 | 2735 | $wgOut->returnToMain( false, $this->mTitle ); |
| 2736 | 2736 | |
| 2737 | | - if( !$wgRequest->getBool( 'hidediff', false ) ) { |
| | 2737 | + if( !$wgRequest->getBool( 'hidediff', false ) && !$wgUser->getBoolOption( 'norollbackdiff', false ) ) { |
| 2738 | 2738 | $de = new DifferenceEngine( $this->mTitle, $current->getId(), $newId, false, true ); |
| 2739 | 2739 | $de->showDiff( '', '' ); |
| 2740 | 2740 | } |
| Index: trunk/phase3/includes/specials/SpecialPreferences.php |
| — | — | @@ -1005,9 +1005,13 @@ |
| 1006 | 1006 | 'externaldiff', |
| 1007 | 1007 | $wgLivePreview ? 'uselivepreview' : false, |
| 1008 | 1008 | 'forceeditsummary', |
| 1009 | | - ) ) . '</fieldset>' |
| 1010 | | - ); |
| | 1009 | + ) ) ); |
| | 1010 | + |
| | 1011 | + if( $wgUser->isAllowed( 'rollback' ) ) |
| | 1012 | + $wgOut->addHtml( $this->getToggle( 'norollbackdiff' ) ); |
| 1011 | 1013 | |
| | 1014 | + $wgOut->addHtml( '</fieldset>' ); |
| | 1015 | + |
| 1012 | 1016 | # Recent changes |
| 1013 | 1017 | $wgOut->addHtml( '<fieldset><legend>' . wfMsgHtml( 'prefs-rc' ) . '</legend>' ); |
| 1014 | 1018 | |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -542,6 +542,7 @@ |
| 543 | 543 | 'tog-diffonly' => 'Do not show page content below diffs', |
| 544 | 544 | 'tog-showhiddencats' => 'Show hidden categories', |
| 545 | 545 | 'tog-noconvertlink' => 'Disable link title conversion', # only translate this message to other languages if you have to change it |
| | 546 | +'tog-norollbackdiff' => 'Omit diff after performing a rollback.', |
| 546 | 547 | |
| 547 | 548 | 'underline-always' => 'Always', |
| 548 | 549 | 'underline-never' => 'Never', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -190,6 +190,7 @@ |
| 191 | 191 | * Set a special temporary directory for ImageMagick with $wgImageMagickTempDir |
| 192 | 192 | * (bug 16113) Show/hide for redirects in Special:NewPages |
| 193 | 193 | * (bug 15903) Upload link was added to Nostalgia skin |
| | 194 | +* (bug 15761) Add user toggle to omit diff after rollback |
| 194 | 195 | |
| 195 | 196 | === Bug fixes in 1.14 === |
| 196 | 197 | |