Merge "Remove "or other" option for stubtreshold"

diff --combined includes/Preferences.php
index 65c4115,8e08fc1..5413f30
--- 1/includes/Preferences.php
--- 2/includes/Preferences.php
+++ b/includes/Preferences.php
@@@ -748,7 -748,7 +748,7 @@@ class Preferences 
                }
  
                $defaultPreferences['stubthreshold'] = array(
-                       'type' => 'selectorother',
+                       'type' => 'select',
                        'section' => 'rendering/advancedrendering',
                        'options' => $stubThresholdOptions,
                        'size' => 20,
@@@ -1047,6 -1047,14 +1047,6 @@@
        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',