From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sat, 2 Apr 2011 09:50:20 +0000 (+0000)
Subject: Respect $wgScriptExtension in SearchEngine::getOpenSearchTemplate() and SearchEngine... 
X-Git-Tag: 1.31.0-rc.0~31079
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=7ad587fcc9bbe822181072aeac8ea7a7c9d1d288;p=lhc%2Fweb%2Fwiklou.git

Respect $wgScriptExtension in SearchEngine::getOpenSearchTemplate() and SearchEngine::getMWSuggestTemplate()
---

diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index 5ed470bba4..b8b14de008 100644
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -439,13 +439,13 @@ class SearchEngine {
 	 * @return String
 	 */
 	public static function getOpenSearchTemplate() {
-		global $wgOpenSearchTemplate, $wgServer, $wgScriptPath;
+		global $wgOpenSearchTemplate, $wgServer;
 		if ( $wgOpenSearchTemplate )	{
 			return $wgOpenSearchTemplate;
 		} else {
 			$ns = implode( '|', SearchEngine::defaultNamespaces() );
 			if ( !$ns ) $ns = "0";
-			return $wgServer . $wgScriptPath . '/api.php?action=opensearch&search={searchTerms}&namespace=' . $ns;
+			return $wgServer . wfScript( 'api' ) . '?action=opensearch&search={searchTerms}&namespace=' . $ns;
 		}
 	}
 
@@ -455,11 +455,11 @@ class SearchEngine {
 	 * @return String
 	 */
 	public static function getMWSuggestTemplate() {
-		global $wgMWSuggestTemplate, $wgServer, $wgScriptPath;
+		global $wgMWSuggestTemplate, $wgServer;
 		if ( $wgMWSuggestTemplate )
 			return $wgMWSuggestTemplate;
 		else
-			return $wgServer . $wgScriptPath . '/api.php?action=opensearch&search={searchTerms}&namespace={namespaces}&suggest';
+			return $wgServer . wfScript( 'api' ) . '?action=opensearch&search={searchTerms}&namespace={namespaces}&suggest';
 	}
 }