Page MenuHomePhabricator

remove_col.diff

Authored By
bzimport
Nov 21 2014, 11:11 PM
Size
3 KB
Referenced Files
None
Subscribers
None

remove_col.diff

commit 41e7afb0b0a32025505f553dd48363697590f4ff
Author: Knoppix User <knoppix@Microknoppix.(none)>
Date: Sat Oct 1 21:37:22 2011 +0000
Removed column user preference
diff --git a/phase3/includes/DefaultSettings.php b/phase3/includes/DefaultSettings.php
index 0ecf9e0..270f0d6 100644
--- a/phase3/includes/DefaultSettings.php
+++ b/phase3/includes/DefaultSettings.php
@@ -3125,7 +3125,6 @@ $wgReservedUsernames = array(
*/
$wgDefaultUserOptions = array(
'ccmeonemails' => 0,
- 'cols' => 80,
'date' => 'default',
'diffonly' => 0,
'disablemail' => 0,
diff --git a/phase3/includes/EditPage.php b/phase3/includes/EditPage.php
index d1c8ec5..89d4f8e 100644
--- a/phase3/includes/EditPage.php
+++ b/phase3/includes/EditPage.php
@@ -1862,7 +1862,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/phase3/includes/OutputPage.php b/phase3/includes/OutputPage.php
index 9585dfb..f42d0b9 100644
--- a/phase3/includes/OutputPage.php
+++ b/phase3/includes/OutputPage.php
@@ -2094,7 +2094,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->getCode(),
diff --git a/phase3/includes/Preferences.php b/phase3/includes/Preferences.php
index 0fc908a..3cbe374 100644
--- a/phase3/includes/Preferences.php
+++ b/phase3/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' ),
@@ -686,13 +685,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/phase3/includes/specials/SpecialUndelete.php b/phase3/includes/specials/SpecialUndelete.php
index 6581a1c..37b1f0e 100644
--- a/phase3/includes/specials/SpecialUndelete.php
+++ b/phase3/includes/specials/SpecialUndelete.php
@@ -857,7 +857,6 @@ class SpecialUndelete extends SpecialPage {
$out->addHTML(
Xml::element( 'textarea', array(
'readonly' => 'readonly',
- 'cols' => intval( $this->getUser()->getOption( 'cols' ) ),
'rows' => intval( $this->getUser()->getOption( 'rows' ) ) ),
$rev->getText( Revision::FOR_THIS_USER ) . "\n" ) .
Xml::openElement( 'div' ) .
diff --git a/phase3/includes/specials/SpecialUpload.php b/phase3/includes/specials/SpecialUpload.php
index d6b8d0a..3e19f4a 100644
--- a/phase3/includes/specials/SpecialUpload.php
+++ b/phase3/includes/specials/SpecialUpload.php
@@ -964,7 +964,6 @@ class UploadForm extends HTMLForm {
? 'filereuploadsummary'
: 'fileuploadsummary',
'default' => $this->mComment,
- 'cols' => intval( $this->getUser()->getOption( 'cols' ) ),
'rows' => 8,
)
);

File Metadata

Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
6514
Default Alt Text
remove_col.diff (3 KB)

Event Timeline