From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 21 Aug 2017 16:42:23 +0000 (+0000)
Subject: Merge "Change 'editfont' default preference to 'monospace'"
X-Git-Tag: 1.31.0-rc.0~2353
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=e7720b8f8e09287384ddee271641d1b1721318bb;hp=21948ec459cbb99167c09b59b7296b7f5d502aa0

Merge "Change 'editfont' default preference to 'monospace'"
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 610df45ae7..26138892b5 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4901,7 +4901,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 25f0dbd796..2f3b954dda 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',
 				]
 			];
 		}