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.

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 11adf5b..f93d330 100644 (file)
--- 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 c7eaa21..9f3df79 100644 (file)
--- 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 fce0e26..21bd9ad 100644 (file)
--- 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 0e7ea34..227e36a 100644 (file)
--- 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 9ba52fb..7c2a1db 100644 (file)
--- 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 cdff4d5..de097b2 100644 (file)
--- 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',