| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -71,6 +71,7 @@ |
| 72 | 72 | details. |
| 73 | 73 | * $wgProfiling has been removed. |
| 74 | 74 | * The spyc library is now no longer included in phase3. |
| | 75 | +* (bug 28343) Unused preferences contextlines/contextchars have been removed |
| 75 | 76 | |
| 76 | 77 | === New features in 1.18 === |
| 77 | 78 | * (bug 8130) Query pages should limit to content namespaces, not just main |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1777,8 +1777,6 @@ |
| 1778 | 1778 | 'columns' => 'Columns:', |
| 1779 | 1779 | 'searchresultshead' => 'Search', |
| 1780 | 1780 | 'resultsperpage' => 'Hits per page:', |
| 1781 | | -'contextlines' => 'Lines per hit:', |
| 1782 | | -'contextchars' => 'Context per line:', |
| 1783 | 1781 | 'stub-threshold' => 'Threshold for <a href="#" class="stub">stub link</a> formatting (bytes):', |
| 1784 | 1782 | 'stub-threshold-disabled' => 'Disabled', |
| 1785 | 1783 | 'recentchangesdays' => 'Days to show in recent changes:', |
| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -942,8 +942,6 @@ |
| 943 | 943 | 'columns', |
| 944 | 944 | 'searchresultshead', |
| 945 | 945 | 'resultsperpage', |
| 946 | | - 'contextlines', |
| 947 | | - 'contextchars', |
| 948 | 946 | 'stub-threshold', |
| 949 | 947 | 'stub-threshold-disabled', |
| 950 | 948 | 'recentchangesdays', |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -3063,8 +3063,6 @@ |
| 3064 | 3064 | $wgDefaultUserOptions = array( |
| 3065 | 3065 | 'ccmeonemails' => 0, |
| 3066 | 3066 | 'cols' => 80, |
| 3067 | | - 'contextchars' => 50, |
| 3068 | | - 'contextlines' => 5, |
| 3069 | 3067 | 'date' => 'default', |
| 3070 | 3068 | 'diffonly' => 0, |
| 3071 | 3069 | 'disablemail' => 0, |
| Index: trunk/phase3/includes/search/SearchEngine.php |
| — | — | @@ -362,14 +362,11 @@ |
| 363 | 363 | } |
| 364 | 364 | |
| 365 | 365 | /** |
| 366 | | - * Find snippet highlight settings for a given user |
| | 366 | + * Find snippet highlight settings for all users |
| 367 | 367 | * |
| 368 | | - * @param $user User |
| 369 | 368 | * @return Array contextlines, contextchars |
| 370 | 369 | */ |
| 371 | | - public static function userHighlightPrefs( &$user ) { |
| 372 | | - // $contextlines = $user->getOption( 'contextlines', 5 ); |
| 373 | | - // $contextchars = $user->getOption( 'contextchars', 50 ); |
| | 370 | + public static function userHighlightPrefs() { |
| 374 | 371 | $contextlines = 2; // Hardcode this. Old defaults sucked. :) |
| 375 | 372 | $contextchars = 75; // same as above.... :P |
| 376 | 373 | return array( $contextlines, $contextchars ); |
| Index: trunk/phase3/includes/Preferences.php |
| — | — | @@ -930,18 +930,6 @@ |
| 931 | 931 | 'section' => 'searchoptions/displaysearchoptions', |
| 932 | 932 | 'min' => 0, |
| 933 | 933 | ); |
| 934 | | - $defaultPreferences['contextlines'] = array( |
| 935 | | - 'type' => 'int', |
| 936 | | - 'label-message' => 'contextlines', |
| 937 | | - 'section' => 'searchoptions/displaysearchoptions', |
| 938 | | - 'min' => 0, |
| 939 | | - ); |
| 940 | | - $defaultPreferences['contextchars'] = array( |
| 941 | | - 'type' => 'int', |
| 942 | | - 'label-message' => 'contextchars', |
| 943 | | - 'section' => 'searchoptions/displaysearchoptions', |
| 944 | | - 'min' => 0, |
| 945 | | - ); |
| 946 | 934 | |
| 947 | 935 | global $wgEnableMWSuggest; |
| 948 | 936 | if ( $wgEnableMWSuggest ) { |