| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -2100,7 +2100,6 @@ |
| 2101 | 2101 | $attribs = $customAttribs + array( |
| 2102 | 2102 | 'accesskey' => ',', |
| 2103 | 2103 | 'id' => $name, |
| 2104 | | - 'cols' => $wgUser->getIntOption( 'cols' ), |
| 2105 | 2104 | 'rows' => $wgUser->getIntOption( 'rows' ), |
| 2106 | 2105 | 'style' => '' // avoid php notices when appending preferences (appending allows customAttribs['style'] to still work |
| 2107 | 2106 | ); |
| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -2248,7 +2248,6 @@ |
| 2249 | 2249 | $params = array( |
| 2250 | 2250 | 'id' => 'wpTextbox1', |
| 2251 | 2251 | 'name' => 'wpTextbox1', |
| 2252 | | - 'cols' => $this->getUser()->getOption( 'cols' ), |
| 2253 | 2252 | 'rows' => $this->getUser()->getOption( 'rows' ), |
| 2254 | 2253 | 'readonly' => 'readonly', |
| 2255 | 2254 | 'lang' => $pageLang->getHtmlCode(), |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -3178,7 +3178,6 @@ |
| 3179 | 3179 | */ |
| 3180 | 3180 | $wgDefaultUserOptions = array( |
| 3181 | 3181 | 'ccmeonemails' => 0, |
| 3182 | | - 'cols' => 80, |
| 3183 | 3182 | 'date' => 'default', |
| 3184 | 3183 | 'diffonly' => 0, |
| 3185 | 3184 | 'disablemail' => 0, |
| Index: trunk/phase3/includes/specials/SpecialUndelete.php |
| — | — | @@ -847,7 +847,6 @@ |
| 848 | 848 | $out->addHTML( |
| 849 | 849 | Xml::element( 'textarea', array( |
| 850 | 850 | 'readonly' => 'readonly', |
| 851 | | - 'cols' => intval( $user->getOption( 'cols' ) ), |
| 852 | 851 | 'rows' => intval( $user->getOption( 'rows' ) ) ), |
| 853 | 852 | $rev->getText( Revision::FOR_THIS_USER, $user ) . "\n" ) . |
| 854 | 853 | Xml::openElement( 'div' ) . |
| Index: trunk/phase3/includes/specials/SpecialUpload.php |
| — | — | @@ -956,7 +956,6 @@ |
| 957 | 957 | ? 'filereuploadsummary' |
| 958 | 958 | : 'fileuploadsummary', |
| 959 | 959 | 'default' => $this->mComment, |
| 960 | | - 'cols' => intval( $this->getUser()->getOption( 'cols' ) ), |
| 961 | 960 | 'rows' => 8, |
| 962 | 961 | ) |
| 963 | 962 | ); |
| Index: trunk/phase3/includes/Preferences.php |
| — | — | @@ -29,7 +29,6 @@ |
| 30 | 30 | static $defaultPreferences = null; |
| 31 | 31 | static $saveFilters = array( |
| 32 | 32 | 'timecorrection' => array( 'Preferences', 'filterTimezoneInput' ), |
| 33 | | - 'cols' => array( 'Preferences', 'filterIntval' ), |
| 34 | 33 | 'rows' => array( 'Preferences', 'filterIntval' ), |
| 35 | 34 | 'rclimit' => array( 'Preferences', 'filterIntval' ), |
| 36 | 35 | 'wllimit' => array( 'Preferences', 'filterIntval' ), |
| — | — | @@ -689,13 +688,7 @@ |
| 690 | 689 | global $wgUseExternalEditor, $wgAllowUserCssPrefs; |
| 691 | 690 | |
| 692 | 691 | ## Editing ##################################### |
| 693 | | - $defaultPreferences['cols'] = array( |
| 694 | | - 'type' => 'int', |
| 695 | | - 'label-message' => 'columns', |
| 696 | | - 'section' => 'editing/textboxsize', |
| 697 | | - 'min' => 4, |
| 698 | | - 'max' => 1000, |
| 699 | | - ); |
| | 692 | + |
| 700 | 693 | $defaultPreferences['rows'] = array( |
| 701 | 694 | 'type' => 'int', |
| 702 | 695 | 'label-message' => 'rows', |