From 937563b444c05cea5ab49f47cde772d1af124fdb Mon Sep 17 00:00:00 2001
From: Benny Situ <bsitu@users.mediawiki.org>
Date: Fri, 23 Dec 2011 22:47:10 +0000
Subject: [PATCH] bug24430 - patch from Chinchin, remove number of column for
 edit field in preference

---
 includes/DefaultSettings.php          | 1 -
 includes/EditPage.php                 | 1 -
 includes/OutputPage.php               | 1 -
 includes/Preferences.php              | 9 +--------
 includes/specials/SpecialUndelete.php | 1 -
 includes/specials/SpecialUpload.php   | 1 -
 6 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 74c544e649..aed36f4c6f 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3178,7 +3178,6 @@ $wgReservedUsernames = array(
  */
 $wgDefaultUserOptions = array(
 	'ccmeonemails'            => 0,
-	'cols'                    => 80,
 	'date'                    => 'default',
 	'diffonly'                => 0,
 	'disablemail'             => 0,
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 2097329df2..088eae859f 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2100,7 +2100,6 @@ HTML
 		$attribs = $customAttribs + array(
 			'accesskey' => ',',
 			'id'   => $name,
-			'cols' => $wgUser->getIntOption( 'cols' ),
 			'rows' => $wgUser->getIntOption( 'rows' ),
 			'style' => '' // avoid php notices when appending preferences (appending allows customAttribs['style'] to still work
 		);
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index bff481effd..1273a7f0c1 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2248,7 +2248,6 @@ class OutputPage extends ContextSource {
 			$params = array(
 				'id'   => 'wpTextbox1',
 				'name' => 'wpTextbox1',
-				'cols' => $this->getUser()->getOption( 'cols' ),
 				'rows' => $this->getUser()->getOption( 'rows' ),
 				'readonly' => 'readonly',
 				'lang' => $pageLang->getHtmlCode(),
diff --git a/includes/Preferences.php b/includes/Preferences.php
index 8fb00e2fec..fde135b891 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -29,7 +29,6 @@ class Preferences {
 	static $defaultPreferences = null;
 	static $saveFilters = array(
 			'timecorrection' => array( 'Preferences', 'filterTimezoneInput' ),
-			'cols' => array( 'Preferences', 'filterIntval' ),
 			'rows' => array( 'Preferences', 'filterIntval' ),
 			'rclimit' => array( 'Preferences', 'filterIntval' ),
 			'wllimit' => array( 'Preferences', 'filterIntval' ),
@@ -689,13 +688,7 @@ class Preferences {
 		global $wgUseExternalEditor, $wgAllowUserCssPrefs;
 
 		## Editing #####################################
-		$defaultPreferences['cols'] = array(
-			'type' => 'int',
-			'label-message' => 'columns',
-			'section' => 'editing/textboxsize',
-			'min' => 4,
-			'max' => 1000,
-		);
+		
 		$defaultPreferences['rows'] = array(
 			'type' => 'int',
 			'label-message' => 'rows',
diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index 9ed20f33cd..87ce43d4aa 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -847,7 +847,6 @@ class SpecialUndelete extends SpecialPage {
 		$out->addHTML(
 			Xml::element( 'textarea', array(
 					'readonly' => 'readonly',
-					'cols' => intval( $user->getOption( 'cols' ) ),
 					'rows' => intval( $user->getOption( 'rows' ) ) ),
 				$rev->getText( Revision::FOR_THIS_USER, $user ) . "\n" ) .
 			Xml::openElement( 'div' ) .
diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 3cb368c732..5782e462f1 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -956,7 +956,6 @@ class UploadForm extends HTMLForm {
 					? 'filereuploadsummary'
 					: 'fileuploadsummary',
 				'default' => $this->mComment,
-				'cols' => intval( $this->getUser()->getOption( 'cols' ) ),
 				'rows' => 8,
 			)
 		);
-- 
2.20.1