From 6e856741bc1080673dd7e244cb4ea9d224b3efab Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Thu, 15 Apr 2010 18:11:24 +0000
Subject: [PATCH] Remove the 'editwidth' preference and related code.

I was not able to find any scenario that changed editor behavior anymore in monobook, modern, vector, classic or chick skin.
---
 includes/DefaultSettings.php      | 1 -
 includes/EditPage.php             | 5 +----
 includes/Preferences.php          | 6 ------
 includes/User.php                 | 1 -
 languages/messages/MessagesEn.php | 1 -
 maintenance/language/messages.inc | 1 -
 6 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 11adf5b3c5..f93d33090c 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2724,7 +2724,6 @@ $wgDefaultUserOptions = array(
 	'editondblclick'          => 0,
 	'editsection'             => 1,
 	'editsectiononrightclick' => 0,
-	'editwidth'               => 0,
 	'enotifminoredits'        => 0,
 	'enotifrevealaddr'        => 0,
 	'enotifusertalkpages'     => 1,
diff --git a/includes/EditPage.php b/includes/EditPage.php
index c7eaa21d65..9f3df79893 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1655,12 +1655,9 @@ INPUTS
 			'id'   => $name,
 			'cols' => $wgUser->getIntOption( 'cols' ), 
 			'rows' => $wgUser->getIntOption( 'rows' ),
-			'style' => '' // avoid php notices when appending for editwidth preference (appending allows customAttribs['style'] to still work
+			'style' => '' // avoid php notices when appending preferences (appending allows customAttribs['style'] to still work
 		);
 
-		if ( $wgUser->getOption( 'editwidth' ) )
-			$attribs['style'] .= 'width: 100%';
-
 		$wgOut->addHTML( Html::textarea( $name, $wikitext, $attribs ) );
 	}
 
diff --git a/includes/Preferences.php b/includes/Preferences.php
index fce0e260b4..21bd9adbcf 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -736,12 +736,6 @@ class Preferences {
 					'section' => 'editing/advancedediting',
 					'label-message' => 'tog-editondblclick',
 				);
-		$defaultPreferences['editwidth'] =
-				array(
-					'type' => 'toggle',
-					'section' => 'editing/advancedediting',
-					'label-message' => 'tog-editwidth',
-				);
 		$defaultPreferences['showtoolbar'] =
 				array(
 					'type' => 'toggle',
diff --git a/includes/User.php b/includes/User.php
index 0e7ea34b7a..227e36af61 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -62,7 +62,6 @@ class User {
 		'editsectiononrightclick',
 		'showtoc',
 		'rememberpassword',
-		'editwidth',
 		'watchcreations',
 		'watchdefault',
 		'watchmoves',
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 9ba52fb1bd..7c2a1db15e 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -628,7 +628,6 @@ XHTML id names.
 'tog-editsectiononrightclick' => 'Enable section editing by right clicking on section titles (requires JavaScript)',
 'tog-showtoc'                 => 'Show table of contents (for pages with more than 3 headings)',
 'tog-rememberpassword'        => 'Remember my login on this computer',
-'tog-editwidth'               => 'Widen the edit box to fill the entire screen',
 'tog-watchcreations'          => 'Add pages I create to my watchlist',
 'tog-watchdefault'            => 'Add pages I edit to my watchlist',
 'tog-watchmoves'              => 'Add pages I move to my watchlist',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index cdff4d5874..de097b212b 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -27,7 +27,6 @@ $wgMessageStructure = array(
 		'tog-editsectiononrightclick',
 		'tog-showtoc',
 		'tog-rememberpassword',
-		'tog-editwidth',
 		'tog-watchcreations',
 		'tog-watchdefault',
 		'tog-watchmoves',
-- 
2.20.1