r96478 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r96477‎ | r96478 | r96479 >
Date:19:45, 7 September 2011
Author:catrope
Status:ok
Tags:
Comment:
Followup r96475: merge the rest of r95000 too
Modified paths:
  • /branches/REL1_18/extensions/OpenSearchXml/OpenSearchXml.php (modified) (history)

Diff [purge]

Index: branches/REL1_18/extensions/OpenSearchXml/OpenSearchXml.php
@@ -52,10 +52,10 @@
5353 }
5454
5555 function efOpenSearchXmlTemplate() {
56 - global $wgServer, $wgScriptPath;
 56+ global $wgCanonicalServer, $wgScriptPath;
5757 $ns = implode( '|', SearchEngine::defaultNamespaces() );
5858 if( !$ns ) {
5959 $ns = '0';
6060 }
61 - return $wgServer . $wgScriptPath . '/api.php?action=opensearch&format=xml&search={searchTerms}&namespace=' . $ns;
 61+ return $wgCanonicalServer . $wgScriptPath . '/api.php?action=opensearch&format=xml&search={searchTerms}&namespace=' . $ns;
6262 }

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r95000Use canonical URLs (introduced in r94995) in the OpenSearch discovery thingycatrope14:39, 19 August 2011
r964751.18: MFT r94737, r94990, r95000, r95001, r95002, r95006, r95007, r95010, r95...catrope19:37, 7 September 2011

Status & tagging log