From: James D. Forrester <jforrester@wikimedia.org>
Date: Thu, 20 Jul 2017 19:13:50 +0000 (-0700)
Subject: Change 'editfont' default preference to 'monospace'
X-Git-Tag: 1.31.0-rc.0~2353^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=af2a215483a8b5c7b368ea958227fecea7ef83cf

Change 'editfont' default preference to 'monospace'

Also change the user preference order to put the default first and the
least-good option last.

Bug: T171201
Change-Id: Ib4c6cd7f2d98824313c2bfcdf3f71d89fc48c929
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f35715e8be..ac6e558fc0 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4838,7 +4838,7 @@ $wgDefaultUserOptions = [
 	'date' => 'default',
 	'diffonly' => 0,
 	'disablemail' => 0,
-	'editfont' => 'default',
+	'editfont' => 'monospace',
 	'editondblclick' => 0,
 	'editsectiononrightclick' => 0,
 	'enotifminoredits' => 0,
diff --git a/includes/Preferences.php b/includes/Preferences.php
index 008963b5a7..c57237328d 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -832,10 +832,10 @@ class Preferences {
 				'section' => 'editing/editor',
 				'label-message' => 'editfont-style',
 				'options' => [
-					$context->msg( 'editfont-default' )->text() => 'default',
 					$context->msg( 'editfont-monospace' )->text() => 'monospace',
 					$context->msg( 'editfont-sansserif' )->text() => 'sans-serif',
 					$context->msg( 'editfont-serif' )->text() => 'serif',
+					$context->msg( 'editfont-default' )->text() => 'default',
 				]
 			];
 		}