From: James D. Forrester <jforrester@wikimedia.org>
Date: Wed, 24 Oct 2018 14:58:47 +0000 (-0700)
Subject: Follow-up cfa70ea6d0: Fix rebase artefact, also remove preference listing
X-Git-Tag: 1.34.0-rc.0~3677
X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;h=9c32d7bcf4c7640c5c8d8564179753590aa2b283;p=lhc%2Fweb%2Fwiklou.git

Follow-up cfa70ea6d0: Fix rebase artefact, also remove preference listing

Change-Id: Ia146f013beba2c82a8f76355b49a4192fbd0ed3b
---

diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php
index f32b1b787b..3265ce7a49 100644
--- a/includes/preferences/DefaultPreferencesFactory.php
+++ b/includes/preferences/DefaultPreferencesFactory.php
@@ -911,11 +911,6 @@ class DefaultPreferencesFactory implements PreferencesFactory {
 			'section' => 'editing/editor',
 			'label-message' => 'tog-useeditwarning',
 		];
-		$defaultPreferences['showtoolbar'] = [
-			'type' => 'toggle',
-			'section' => 'editing/editor',
-			'label-message' => 'tog-showtoolbar',
-		];
 
 		$defaultPreferences['previewonfirst'] = [
 			'type' => 'toggle',