Remove searchlimit preference

Change-Id: Ib3dd2ba54261514b827d12a21536392530c7e02e

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9b2b676..92ceb6f 100644 (file)
--- 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 3ff99fc..65c4115 100644 (file)
--- 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 62eeb40..64a3d2d 100644 (file)
--- 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 1889368..2a10a78 100644 (file)
--- 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 d9ef44a..aa8f5ed 100644 (file)
--- 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',