diff options
| author | Roan Kattouw <catrope@users.mediawiki.org> | 2011-08-19 14:39:37 +0000 |
|---|---|---|
| committer | Roan Kattouw <catrope@users.mediawiki.org> | 2011-08-19 14:39:37 +0000 |
| commit | 1c92b1463e881552a050a6efe3a181f3029a64ae (patch) | |
| tree | f1480ed2939243b9561186916e6a5324e0d8251d /includes/search | |
| parent | 04e002d5823dbb63cdd52bb235846fd08d433585 (diff) | |
| download | mediawikicore-1c92b1463e881552a050a6efe3a181f3029a64ae.tar.gz mediawikicore-1c92b1463e881552a050a6efe3a181f3029a64ae.zip | |
Use canonical URLs (introduced in r94995) in the OpenSearch discovery thingy
Notes
Notes:
http://mediawiki.org/wiki/Special:Code/MediaWiki/95000
Diffstat (limited to 'includes/search')
| -rw-r--r-- | includes/search/SearchEngine.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php index fe37279c01e6..40b992de4112 100644 --- a/includes/search/SearchEngine.php +++ b/includes/search/SearchEngine.php @@ -472,7 +472,7 @@ class SearchEngine { * @return String */ public static function getOpenSearchTemplate() { - global $wgOpenSearchTemplate, $wgServer; + global $wgOpenSearchTemplate, $wgCanonicalServer; if ( $wgOpenSearchTemplate ) { return $wgOpenSearchTemplate; } else { @@ -480,7 +480,7 @@ class SearchEngine { if ( !$ns ) { $ns = "0"; } - return $wgServer . wfScript( 'api' ) . '?action=opensearch&search={searchTerms}&namespace=' . $ns; + return $wgCanonicalServer . wfScript( 'api' ) . '?action=opensearch&search={searchTerms}&namespace=' . $ns; } } |