| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -2240,6 +2240,7 @@ |
| 2241 | 2241 | $attribs = $customAttribs + array( |
| 2242 | 2242 | 'accesskey' => ',', |
| 2243 | 2243 | 'id' => $name, |
| | 2244 | + 'cols' => $wgUser->getIntOption( 'cols' ), |
| 2244 | 2245 | 'rows' => $wgUser->getIntOption( 'rows' ), |
| 2245 | 2246 | 'style' => '' // avoid php notices when appending preferences (appending allows customAttribs['style'] to still work |
| 2246 | 2247 | ); |
| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -2248,6 +2248,7 @@ |
| 2249 | 2249 | $params = array( |
| 2250 | 2250 | 'id' => 'wpTextbox1', |
| 2251 | 2251 | 'name' => 'wpTextbox1', |
| | 2252 | + 'cols' => $this->getUser()->getOption( 'cols' ), |
| 2252 | 2253 | 'rows' => $this->getUser()->getOption( 'rows' ), |
| 2253 | 2254 | 'readonly' => 'readonly', |
| 2254 | 2255 | 'lang' => $pageLang->getHtmlCode(), |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -3192,6 +3192,7 @@ |
| 3193 | 3193 | */ |
| 3194 | 3194 | $wgDefaultUserOptions = array( |
| 3195 | 3195 | 'ccmeonemails' => 0, |
| | 3196 | + 'cols' => 80, |
| 3196 | 3197 | 'date' => 'default', |
| 3197 | 3198 | 'diffonly' => 0, |
| 3198 | 3199 | 'disablemail' => 0, |
| Index: trunk/phase3/includes/specials/SpecialUndelete.php |
| — | — | @@ -847,6 +847,7 @@ |
| 848 | 848 | $out->addHTML( |
| 849 | 849 | Xml::element( 'textarea', array( |
| 850 | 850 | 'readonly' => 'readonly', |
| | 851 | + 'cols' => intval( $user->getOption( 'cols' ) ), |
| 851 | 852 | 'rows' => intval( $user->getOption( 'rows' ) ) ), |
| 852 | 853 | $rev->getText( Revision::FOR_THIS_USER, $user ) . "\n" ) . |
| 853 | 854 | Xml::openElement( 'div' ) . |
| Index: trunk/phase3/includes/specials/SpecialUpload.php |
| — | — | @@ -962,6 +962,7 @@ |
| 963 | 963 | ? 'filereuploadsummary' |
| 964 | 964 | : 'fileuploadsummary', |
| 965 | 965 | 'default' => $this->mComment, |
| | 966 | + 'cols' => intval( $this->getUser()->getOption( 'cols' ) ), |
| 966 | 967 | 'rows' => 8, |
| 967 | 968 | ) |
| 968 | 969 | ); |
| Index: trunk/phase3/includes/Preferences.php |
| — | — | @@ -29,6 +29,7 @@ |
| 30 | 30 | static $defaultPreferences = null; |
| 31 | 31 | static $saveFilters = array( |
| 32 | 32 | 'timecorrection' => array( 'Preferences', 'filterTimezoneInput' ), |
| | 33 | + 'cols' => array( 'Preferences', 'filterIntval' ), |
| 33 | 34 | 'rows' => array( 'Preferences', 'filterIntval' ), |
| 34 | 35 | 'rclimit' => array( 'Preferences', 'filterIntval' ), |
| 35 | 36 | 'wllimit' => array( 'Preferences', 'filterIntval' ), |
| — | — | @@ -688,7 +689,13 @@ |
| 689 | 690 | global $wgUseExternalEditor, $wgAllowUserCssPrefs; |
| 690 | 691 | |
| 691 | 692 | ## Editing ##################################### |
| 692 | | - |
| | 693 | + $defaultPreferences['cols'] = array( |
| | 694 | + 'type' => 'int', |
| | 695 | + 'label-message' => 'columns', |
| | 696 | + 'section' => 'editing/textboxsize', |
| | 697 | + 'min' => 4, |
| | 698 | + 'max' => 1000, |
| | 699 | + ); |
| 693 | 700 | $defaultPreferences['rows'] = array( |
| 694 | 701 | 'type' => 'int', |
| 695 | 702 | 'label-message' => 'rows', |