diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2014-01-08 18:49:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2014-01-08 18:49:22 +0000 |
| commit | 39572df35cca622b2a82ba5224ed14988a39acb6 (patch) | |
| tree | cd24debeeb0284acc968e9447c5f9a8c2da6c3ad | |
| parent | 747b0d3fb80fa53d81735ad4e271f8e5c36df3e0 (diff) | |
| parent | f5e7453f5ce96d14556674673c97a315010ab252 (diff) | |
| download | mediawikicore-39572df35cca622b2a82ba5224ed14988a39acb6.tar.gz mediawikicore-39572df35cca622b2a82ba5224ed14988a39acb6.zip | |
Merge "Remove searchlimit preference"
| -rw-r--r-- | includes/DefaultSettings.php | 1 | ||||
| -rw-r--r-- | includes/Preferences.php | 8 | ||||
| -rw-r--r-- | includes/specials/SpecialSearch.php | 2 | ||||
| -rw-r--r-- | languages/messages/MessagesEn.php | 1 | ||||
| -rw-r--r-- | maintenance/language/messages.inc | 1 |
5 files changed, 1 insertions, 12 deletions
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 9b2b6762f4ce..92ceb6f81f11 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -4026,7 +4026,6 @@ $wgDefaultUserOptions = array( 'rclimit' => 50, 'rememberpassword' => 0, 'rows' => 25, - 'searchlimit' => 20, 'showhiddencats' => 0, 'shownumberswatching' => 1, 'showtoc' => 1, diff --git a/includes/Preferences.php b/includes/Preferences.php index 3ff99fce256a..65c41159759b 100644 --- a/includes/Preferences.php +++ b/includes/Preferences.php @@ -1047,14 +1047,6 @@ class Preferences { static function searchPreferences( $user, IContextSource $context, &$defaultPreferences ) { global $wgContLang, $wgVectorUseSimpleSearch; - ## Search ##################################### - $defaultPreferences['searchlimit'] = array( - 'type' => 'int', - 'label-message' => 'resultsperpage', - 'section' => 'searchoptions/displaysearchoptions', - 'min' => 0, - ); - if ( $wgVectorUseSimpleSearch ) { $defaultPreferences['vector-simplesearch'] = array( 'type' => 'toggle', diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index 9bacc8fd6a4f..e4ca05705714 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -120,7 +120,7 @@ class SpecialSearch extends SpecialPage { */ public function load() { $request = $this->getRequest(); - list( $this->limit, $this->offset ) = $request->getLimitOffset( 20, 'searchlimit' ); + list( $this->limit, $this->offset ) = $request->getLimitOffset( 20 ); $this->mPrefix = $request->getVal( 'prefix', '' ); $user = $this->getUser(); diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 1889368abac2..2a10a78553bf 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1911,7 +1911,6 @@ Note that their indexes of {{SITENAME}} content may be out of date.', 'rows' => 'Rows:', 'columns' => 'Columns:', 'searchresultshead' => 'Search', -'resultsperpage' => 'Hits per page:', 'stub-threshold' => 'Threshold for <a href="#" class="stub">stub link</a> formatting (bytes):', 'stub-threshold-disabled' => 'Disabled', 'recentchangesdays' => 'Days to show in recent changes:', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index d9ef44a71405..aa8f5ede4e7f 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -1037,7 +1037,6 @@ $wgMessageStructure = array( 'rows', 'columns', 'searchresultshead', - 'resultsperpage', 'stub-threshold', 'stub-threshold-disabled', 'recentchangesdays', |