From: Tim Eulitz Date: Tue, 26 Mar 2019 09:13:45 +0000 (+0100) Subject: Remove temporary rollback confirmation toggle X-Git-Tag: 1.34.0-rc.0~2289^2 X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=8736acada9564c8808e1d7231745c6fee7ee47ad;p=lhc%2Fweb%2Fwiklou.git Remove temporary rollback confirmation toggle This patch removes the temporary rollback confirmation toggle that was implemented to allow certain wikis to disable the rollback confirmation feature while still showing the option in the user preferences. For reference: https://gerrit.wikimedia.org/r/c/mediawiki/core/+/494249 Bug: T217437 Change-Id: I001d7927f6f44a4cc517a80b71f5b83aca33824c --- diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 7a645a6bc8..46b4f95cd0 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -9029,16 +9029,6 @@ $wgPriorityHints = false; */ $wgElementTiming = false; -/** - * Temporary option to show rollback confirmation user settings - * without activating the feature itself - * @see T217039 - * @since 1.33 - * @deprecated 1.33 - * @var bool - */ -$wgDisableRollbackConfirmationFeature = false; - /** * For really cool vim folding this needs to be at the end: * vim: foldmarker=@{,@} foldmethod=marker diff --git a/includes/Linker.php b/includes/Linker.php index ec3b245606..20b50d2bb4 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -1765,15 +1765,7 @@ class Linker { $inner = $context->msg( 'brackets' )->rawParams( $inner )->escaped(); } - /** - * FIXME - * Remove all references to DisableRollbackConfirmationFeature - * after release of rollback feature. See T199534 - */ - if ( !MediaWikiServices::getInstance() - ->getMainConfig()->get( 'DisableRollbackConfirmationFeature' ) && - $context->getUser()->getBoolOption( 'showrollbackconfirmation' ) - ) { + if ( $context->getUser()->getBoolOption( 'showrollbackconfirmation' ) ) { $stats = MediaWikiServices::getInstance()->getStatsdDataFactory(); $stats->increment( 'rollbackconfirmation.event.load' ); $context->getOutput()->addModules( 'mediawiki.page.rollback.confirmation' ); diff --git a/includes/actions/RollbackAction.php b/includes/actions/RollbackAction.php index 0e86fda81a..e2fc265f96 100644 --- a/includes/actions/RollbackAction.php +++ b/includes/actions/RollbackAction.php @@ -73,20 +73,12 @@ class RollbackAction extends FormAction { } /** - * @throws ConfigException * @throws ErrorPageError * @throws ReadOnlyError * @throws ThrottledError */ public function show() { - /** - * FIXME - * Remove temporary check of DisableRollbackConfirmationFeature - * after release of rollback feature. See T199534 - */ - $config = \MediaWiki\MediaWikiServices::getInstance()->getMainConfig(); - if ( $config->get( 'DisableRollbackConfirmationFeature' ) == true || - $this->getUser()->getOption( 'showrollbackconfirmation' ) == false || + if ( $this->getUser()->getOption( 'showrollbackconfirmation' ) == false || $this->getRequest()->wasPosted() ) { $this->handleRollbackRequest(); } else { diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php index b2f5342ad2..a42726f7b4 100644 --- a/includes/preferences/DefaultPreferencesFactory.php +++ b/includes/preferences/DefaultPreferencesFactory.php @@ -870,17 +870,6 @@ class DefaultPreferencesFactory implements PreferencesFactory { 'section' => 'rendering/advancedrendering', 'label-message' => 'tog-showrollbackconfirmation', ]; - - /** - * FIXME - * Remove temporary help text and references to DisableRollbackConfirmationFeature - * after release of rollback feature. See T199534 - */ - if ( MediaWikiServices::getInstance() - ->getMainConfig()->get( 'DisableRollbackConfirmationFeature' ) ) { - $defaultPreferences['showrollbackconfirmation'] - ['help-message'] = 'tog-showrollbackconfirmation-prerelease-warning'; - } } } diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 05bbf3cbfa..8f4d58726e 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -47,7 +47,6 @@ "tog-useeditwarning": "Warn me when I leave an edit page with unsaved changes", "tog-prefershttps": "Always use a secure connection while logged in", "tog-showrollbackconfirmation": "Show a confirmation prompt when clicking on a rollback link", - "tog-showrollbackconfirmation-prerelease-warning": "Please note: This feature is not available yet. If you set this preference now, your choice will be remembered [https://meta.wikimedia.org/wiki/WMDE_Technical_Wishes/Rollback#Status when the feature is released].", "underline-always": "Always", "underline-never": "Never", "underline-default": "Skin or browser default", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index 7b0533a739..292f682b91 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -253,7 +253,6 @@ "tog-useeditwarning": "Used as label for the checkbox in [[Special:Preferences#mw-prefsection-editing|Special:Preferences]].", "tog-prefershttps": "Toggle option used in [[Special:Preferences]] that indicates if the user wants to use a secure connection when logged in", "tog-showrollbackconfirmation": "Toggle option used in [[Special:Preferences]] to enable/disable rollback confirmation prompt. Should be visible only to users with rollback rights.", - "tog-showrollbackconfirmation-prerelease-warning": "Notice for wikis where the option can be set before the feature is enabled.\n\nNote: This notice is temporary and will only appear before the rollback confirmation feature is released.", "underline-always": "Used in [[Special:Preferences#mw-prefsection-rendering|Preferences]].\n\nThis option means \"always underline links\", there are also options {{msg-mw|Underline-never}} and {{msg-mw|Underline-default}}.\n\n{{Gender}}\n{{Identical|Always}}", "underline-never": "Used in [[Special:Preferences#mw-prefsection-rendering|Preferences]].\n\nThis option means \"never underline links\", there are also options {{msg-mw|Underline-always}} and {{msg-mw|Underline-default}}.\n\n{{Gender}}\n{{Identical|Never}}", "underline-default": "Used in [[Special:Preferences#mw-prefsection-rendering|Preferences]].\n\nThis option means \"underline links as in your user skin or your browser\", there are also options {{msg-mw|Underline-never}} and {{msg-mw|Underline-always}}.\n\n{{Gender}}\n{{Identical|Browser default}}",