From 07c0c409782207c3cffeda2b38626db24bb2002f Mon Sep 17 00:00:00 2001
From: Tim Eulitz <tim.eulitz@wikimedia.de>
Date: Mon, 18 Mar 2019 14:40:09 +0100
Subject: [PATCH] Remove rollback confirmation user preference

Due to a delay in the rollout of this feature, this part of the code has
to be temporarily removed again to prevent an unused setting from
popping up in the user settings.

Bug: T218556
Change-Id: I0f4e822fc25fddc2bc3c0b55b0792799a1e4c4ba
---
 includes/preferences/DefaultPreferencesFactory.php   | 12 +-----------
 .../preferences/DefaultPreferencesFactoryTest.php    |  4 ++++
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php
index a42726f7b4..36518823e9 100644
--- a/includes/preferences/DefaultPreferencesFactory.php
+++ b/includes/preferences/DefaultPreferencesFactory.php
@@ -121,7 +121,7 @@ class DefaultPreferencesFactory implements PreferencesFactory {
 		$this->skinPreferences( $user, $context, $preferences );
 		$this->datetimePreferences( $user, $context, $preferences );
 		$this->filesPreferences( $context, $preferences );
-		$this->renderingPreferences( $user, $context, $preferences );
+		$this->renderingPreferences( $context, $preferences );
 		$this->editingPreferences( $user, $context, $preferences );
 		$this->rcPreferences( $user, $context, $preferences );
 		$this->watchlistPreferences( $user, $context, $preferences );
@@ -800,12 +800,10 @@ class DefaultPreferencesFactory implements PreferencesFactory {
 	}
 
 	/**
-	 * @param User $user
 	 * @param MessageLocalizer $l10n
 	 * @param array &$defaultPreferences
 	 */
 	protected function renderingPreferences(
-		User $user,
 		MessageLocalizer $l10n,
 		&$defaultPreferences
 	) {
@@ -863,14 +861,6 @@ class DefaultPreferencesFactory implements PreferencesFactory {
 			'section' => 'rendering/advancedrendering',
 			'label-message' => 'tog-numberheadings',
 		];
-
-		if ( $user->isAllowed( 'rollback' ) ) {
-			$defaultPreferences['showrollbackconfirmation'] = [
-				'type' => 'toggle',
-				'section' => 'rendering/advancedrendering',
-				'label-message' => 'tog-showrollbackconfirmation',
-			];
-		}
 	}
 
 	/**
diff --git a/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php b/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php
index 94c0667b29..8142f3979b 100644
--- a/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php
+++ b/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php
@@ -87,6 +87,8 @@ class DefaultPreferencesFactoryTest extends \MediaWikiTestCase {
 	 * @covers MediaWiki\Preferences\DefaultPreferencesFactory::renderingPreferences()
 	 */
 	public function testShowRollbackConfIsHiddenForUsersWithoutRollbackRights() {
+		// TODO Remove temporary skip marker once feature is added back in
+		$this->markTestSkipped();
 		$userMock = $this->getMockBuilder( User::class )
 			->disableOriginalConstructor()
 			->getMock();
@@ -107,6 +109,8 @@ class DefaultPreferencesFactoryTest extends \MediaWikiTestCase {
 	 * @covers MediaWiki\Preferences\DefaultPreferencesFactory::renderingPreferences()
 	 */
 	public function testShowRollbackConfIsShownForUsersWithRollbackRights() {
+		// TODO Remove temporary skip marker once feature is added back in
+		$this->markTestSkipped();
 		$userMock = $this->getMockBuilder( User::class )
 			->disableOriginalConstructor()
 			->getMock();
-- 
2.20.1