From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Fri, 18 Jun 2010 17:36:54 +0000 (+0000)
Subject: Followup to r68177: per CR, move SimpleSearch preference to core.
X-Git-Tag: 1.31.0-rc.0~36476
X-Git-Url: http://git.cyclocoop.org/%27.%28%24current%20%3E%202?a=commitdiff_plain;h=0d6b87dc2345ace50fc4d39af104699c2a37b0d0;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/includes/Preferences.php b/includes/Preferences.php
index d8891849d5..677593fbbc 100644
--- 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 7ad37af610..b45e41b886 100644
--- 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',