From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 3 Dec 2011 13:29:22 +0100
Subject: Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing
---
 opensearch_desc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'opensearch_desc.php')

diff --git a/opensearch_desc.php b/opensearch_desc.php
index cc6c4719..85ec5801 100644
--- a/opensearch_desc.php
+++ b/opensearch_desc.php
@@ -51,7 +51,7 @@ print Xml::element( 'Image',
 		'height' => 16,
 		'width' => 16,
 		'type' => 'image/x-icon' ),
-	wfExpandUrl( $wgFavicon ) );
+	wfExpandUrl( $wgFavicon , PROTO_CURRENT ) );
 
 $urls = array();
 
@@ -62,7 +62,7 @@ $searchPage = SpecialPage::getTitleFor( 'Search' );
 $urls[] = array(
 	'type' => 'text/html',
 	'method' => 'get',
-	'template' => $searchPage->getFullURL( 'search={searchTerms}' ) );
+	'template' => $searchPage->getCanonicalURL( 'search={searchTerms}' ) );
 
 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,
-	$searchPage->getFullUrl() );
+	$searchPage->getCanonicalURL() );
 
 print '</OpenSearchDescription>';
-- 
cgit v1.2.2