dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New OutputPage::addJsConfigVars() method (bug 31233)
[lhc/web/wiklou.git]
/
opensearch_desc.php
diff --git
a/opensearch_desc.php
b/opensearch_desc.php
index
cc6c471
..
85ec580
100644
(file)
--- a/
opensearch_desc.php
+++ b/
opensearch_desc.php
@@
-51,7
+51,7
@@
print Xml::element( 'Image',
'height' => 16,
'width' => 16,
'type' => 'image/x-icon' ),
'height' => 16,
'width' => 16,
'type' => 'image/x-icon' ),
- wfExpandUrl( $wgFavicon ) );
+ wfExpandUrl( $wgFavicon
, PROTO_CURRENT
) );
$urls = array();
$urls = array();
@@
-62,7
+62,7
@@
$searchPage = SpecialPage::getTitleFor( 'Search' );
$urls[] = array(
'type' => 'text/html',
'method' => 'get',
$urls[] = array(
'type' => 'text/html',
'method' => 'get',
- 'template' => $searchPage->get
Ful
lURL( 'search={searchTerms}' ) );
+ 'template' => $searchPage->get
Canonica
lURL( 'search={searchTerms}' ) );
if( $wgEnableAPI ) {
// JSON interface for search suggestions.
if( $wgEnableAPI ) {
// JSON interface for search suggestions.
@@
-86,6
+86,6
@@
foreach( $urls as $attribs ) {
// sends you to the domain root if you hit "enter" with an empty
// search box.
print Xml::element( 'moz:SearchForm', null,
// sends you to the domain root if you hit "enter" with an empty
// search box.
print Xml::element( 'moz:SearchForm', null,
- $searchPage->get
FullUrl
() );
+ $searchPage->get
CanonicalURL
() );
print '</OpenSearchDescription>';
print '</OpenSearchDescription>';