From: Paladox <thomasmulhall410@yahoo.com>
Date: Sun, 15 Jan 2017 18:18:29 +0000 (+0000)
Subject: mediawiki.searchSuggest: Add support for search namespace preferences
X-Git-Tag: 1.31.0-rc.0~1893^2
X-Git-Url: http://git.cyclocoop.org/%27.parametre_url%28%20%20%20generer_action_auteur%28%27charger_plugin%27%2C%20%27update_flux%27%29%2C%27update_flux%27%2C%20%27oui%27%29.%27?a=commitdiff_plain;h=f307080b8636f9f59b7ba6a7b5f8b5d528c68934;p=lhc%2Fweb%2Fwiklou.git

mediawiki.searchSuggest: Add support for search namespace preferences

This way it allows namespaces other then NS_MAIN.

Bug: T26214
Change-Id: I6a545eb8563e81a66de39a8295ef2e40c3e73f95
---

diff --git a/resources/src/mediawiki/mediawiki.searchSuggest.js b/resources/src/mediawiki/mediawiki.searchSuggest.js
index 1c1150e423..e7859cf75a 100644
--- a/resources/src/mediawiki/mediawiki.searchSuggest.js
+++ b/resources/src/mediawiki/mediawiki.searchSuggest.js
@@ -2,6 +2,12 @@
  * Add search suggestions to the search form.
  */
 ( function ( mw, $ ) {
+	var searchNS = $.map( mw.config.get( 'wgFormattedNamespaces' ), function ( nsName, nsID ) {
+		if ( nsID >= 0 && mw.user.options.get( 'searchNs' + nsID ) ) {
+			// Cast string key to number
+			return Number( nsID );
+		}
+	} );
 	mw.searchSuggest = {
 		// queries the wiki and calls response with the result
 		request: function ( api, query, response, maxRows, namespace ) {
@@ -9,7 +15,7 @@
 				formatversion: 2,
 				action: 'opensearch',
 				search: query,
-				namespace: namespace || 0,
+				namespace: namespace || searchNS,
 				limit: maxRows,
 				suggest: true
 			} ).done( function ( data, jqXHR ) {