Respect $wgScriptExtension in SearchEngine::getOpenSearchTemplate() and SearchEngine...

diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index 5ed470b..b8b14de 100644 (file)
--- 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';
        }
 }