From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Thu, 12 Feb 2009 17:27:05 +0000 (+0000)
Subject: API: Fix up r47142: use a boolean parameter for suggest
X-Git-Tag: 1.31.0-rc.0~42920
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=f0c3eaf4442ce0ed339df8c24c92aaa912f5cbce;p=lhc%2Fweb%2Fwiklou.git

API: Fix up r47142: use a boolean parameter for suggest
---

diff --git a/includes/SearchEngine.php b/includes/SearchEngine.php
index 1fdded3b92..f69ae8389a 100644
--- a/includes/SearchEngine.php
+++ b/includes/SearchEngine.php
@@ -403,7 +403,7 @@ class SearchEngine {
 		if($wgMWSuggestTemplate)		
 			return $wgMWSuggestTemplate;
 		else 
-			return $wgServer . $wgScriptPath . '/api.php?action=opensearch&search={searchTerms}&namespace={namespaces}&suggest=1';
+			return $wgServer . $wgScriptPath . '/api.php?action=opensearch&search={searchTerms}&namespace={namespaces}&suggest';
 	}
 }
 
diff --git a/includes/api/ApiOpenSearch.php b/includes/api/ApiOpenSearch.php
index d463833cd7..db95335045 100644
--- a/includes/api/ApiOpenSearch.php
+++ b/includes/api/ApiOpenSearch.php
@@ -77,9 +77,7 @@ class ApiOpenSearch extends ApiBase {
 				ApiBase :: PARAM_TYPE => 'namespace',
 				ApiBase :: PARAM_ISMULTI => true
 			),
-			'suggest' => array(
-				ApiBase :: PARAM_TYPE => 'integer'
-			),
+			'suggest' => false,
 		);
 	}
 
@@ -88,6 +86,7 @@ class ApiOpenSearch extends ApiBase {
 			'search' => 'Search string',
 			'limit' => 'Maximum amount of results to return',
 			'namespace' => 'Namespaces to search',
+			'suggest' => 'Do nothing if $wgEnableMWSuggest is false',
 		);
 	}