From: James D. Forrester <jforrester@wikimedia.org>
Date: Wed, 30 May 2018 15:34:51 +0000 (-0700)
Subject: Special:Preferences/reset: Always use OOUI not the deprecated vform
X-Git-Tag: 1.34.0-rc.0~5243^2
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=540538eba210858184ee6734a17e2216b166031b;p=lhc%2Fweb%2Fwiklou.git

Special:Preferences/reset: Always use OOUI not the deprecated vform

Though it's "nice" to show this as a big red button to users, sadly
(a) vform is deprecated and shouldn't be used, and (b) the format's
restriction on button width intereferes with the length of the sole
control on this form, even without the prolix override expansion of
for which wikis' communities are wont to do.

Bug: T195977
Change-Id: Icc294bde1d3ed72837e7152003a2fbd522c9067d
---

diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index 41ee353a78..0490cbbfce 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -184,9 +184,7 @@ class SpecialPreferences extends SpecialPage {
 
 		$context = new DerivativeContext( $this->getContext() );
 		$context->setTitle( $this->getPageTitle( 'reset' ) ); // Reset subpage
-		$htmlForm = HTMLForm::factory(
-			$this->oouiEnabled ? 'ooui' : 'vform', [], $context, 'prefs-restore'
-		);
+		$htmlForm = HTMLForm::factory( 'ooui', [], $context, 'prefs-restore' );
 
 		$htmlForm->setSubmitTextMsg( 'restoreprefs' );
 		$htmlForm->setSubmitDestructive();