Followup to r68177: per CR, move SimpleSearch preference to core.

diff --git a/includes/Preferences.php b/includes/Preferences.php
index d889184..677593f 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -923,6 +923,15 @@ class Preferences {
                                'section' => 'searchoptions/display',
                        );
                }
+               
+               global $wgVectorUseSimpleSearch;
+               if ( $wgVectorUseSimpleSearch ) {
+                       $defaultPreferences['vector-simplesearch'] = array(
+                               'type' => 'toggle',
+                               'label-message' => 'vector-simplesearch-preference',
+                               'section' => 'searchoptions/display'
+                       );
+               }
 
                $defaultPreferences['searcheverything'] = array(
                        'type' => 'toggle',

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 7ad37af..b45e41b 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -796,6 +796,7 @@ XHTML id names.
 'vector-namespace-talk'      => 'Discussion',
 'vector-namespace-template'  => 'Template',
 'vector-namespace-user'      => 'User page',
+'vector-simplesearch-preference' => 'Enable enhanced search suggestions (Vector skin only)',
 'vector-view-create'         => 'Create',
 'vector-view-edit'           => 'Edit',
 'vector-view-history'        => 'View history',