From 3c61c3f17aa1b50f690d452f68c842b7c4a994db Mon Sep 17 00:00:00 2001
From: Leo Koppelkamm <diebuche@users.mediawiki.org>
Date: Thu, 28 Jul 2011 11:22:42 +0000
Subject: [PATCH] r91728 : Fix a problem for api.php5 users and remove an
 unneeded function parameter from deliverResult

---
 .../mediawiki.page.mwsuggest.js               | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/resources/mediawiki.page/mediawiki.page.mwsuggest.js b/resources/mediawiki.page/mediawiki.page.mwsuggest.js
index eae029a2f4..42b441235a 100644
--- a/resources/mediawiki.page/mediawiki.page.mwsuggest.js
+++ b/resources/mediawiki.page/mediawiki.page.mwsuggest.js
@@ -2,7 +2,7 @@ jQuery( document ).ready( function( $ ) {
 	var $container = $( '<div>', { 'class' : 'open-search-suggestions' } ),
 		cache = {},
 		$suggestionList,
-		url = mw.config.get( 'wgScriptPath' ) + '/api.php?format=json&action=opensearch&search=',
+		url = mw.util.wikiScript( 'api' ),
 		maxRowWindow;
 	
 	//Append the container which will hold the menu to the body
@@ -14,19 +14,19 @@ jQuery( document ).ready( function( $ ) {
 	 */
 	var getNamespaces = function() {
 		var namespaces = [];
-		$('form#powersearch, form#search').find( '[name^="ns"]' ).each(function() {
+		$( 'form#powersearch, form#search' ).find( '[name^="ns"]' ).each(function() {
 			if ( this.checked || ( this.type == 'hidden' && this.value == '1' ) ) {
 				namespaces.push( this.name.substring( 2 ) );
 			}
 		});
 		if ( !namespaces.length ) {
-			namespaces = mw.config.get('wgSearchNamespaces');
+			namespaces = mw.config.get( 'wgSearchNamespaces' );
 		}
 		return namespaces.join('|');
 	};
 
 	/* Helper function to make sure that the list doesn't expand below the visible part of the window */
-	var deliverResult = function( obj, response, maxRowWindow ) {
+	var deliverResult = function( obj, response ) {
 		if ( obj && obj.length > 1 ) {
 			response( obj[1] );
 			// Get the lowest from multiple numbers using fn.apply
@@ -45,13 +45,19 @@ jQuery( document ).ready( function( $ ) {
 			// We're caching queries for performance
 			var term = request.term + namespaces;
 			if ( term in cache ) {
-				deliverResult( cache[term], response, maxRowWindow );
+				deliverResult( cache[term], response );
 				return;
 			}
-			$.getJSON( url + mw.util.rawurlencode( request.term ) + '&namespace=' + namespaces, function ( obj ) {
+			var params = {
+				format : 'json',
+				action : 'opensearch',
+				search : request.term,
+				namespaces : namespaces
+			};
+			$.getJSON( url, params, function ( obj ) {
 				// Save to cache
 				cache[ term ] = obj;
-				deliverResult( obj, response, maxRowWindow );
+				deliverResult( obj, response );
 			});
 		},
 		select : function() {
-- 
2.20.1