From: Benny Situ <bsitu@users.mediawiki.org>
Date: Wed, 25 Jan 2012 18:26:46 +0000 (+0000)
Subject: Revert from 107187 to 107186 for bug24430 patch, it causes layout issue
X-Git-Tag: 1.31.0-rc.0~25085
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=978f299e03db0e388417a70e9fb926e76917c50b;p=lhc%2Fweb%2Fwiklou.git

Revert from 107187 to 107186 for bug24430 patch, it causes layout issue
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index d8af9ebb40..6d588f7df3 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3192,6 +3192,7 @@ $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 50ae02452e..29aaee8e53 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2240,6 +2240,7 @@ 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 54f6f33a42..70a8c53d22 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2248,6 +2248,7 @@ 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 a42c3844eb..3fe6a8cc0e 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -29,6 +29,7 @@ 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' ),
@@ -688,7 +689,13 @@ 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 87ce43d4aa..9ed20f33cd 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -847,6 +847,7 @@ 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 a3e700a2ae..3711a6ac15 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -962,6 +962,7 @@ class UploadForm extends HTMLForm {
 					? 'filereuploadsummary'
 					: 'fileuploadsummary',
 				'default' => $this->mComment,
+				'cols' => intval( $this->getUser()->getOption( 'cols' ) ),
 				'rows' => 8,
 			)
 		);