From 7ad587fcc9bbe822181072aeac8ea7a7c9d1d288 Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sat, 2 Apr 2011 09:50:20 +0000
Subject: [PATCH] Respect $wgScriptExtension in
 SearchEngine::getOpenSearchTemplate() and
 SearchEngine::getMWSuggestTemplate()

---
 includes/search/SearchEngine.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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';
 	}
 }
 
-- 
2.20.1