From b431cdb7466b3b932b17339f92c568ab60a37a90 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sun, 2 Mar 2008 21:19:44 +0000 Subject: [PATCH] Follow-up for bug 12723 -- use the opensearch-desc message for the link as well as the final xml --- includes/Skin.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/includes/Skin.php b/includes/Skin.php index 1e6202859c..230b642d72 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -153,7 +153,7 @@ class Skin extends Linker { } function initPage( &$out ) { - global $wgFavicon, $wgAppleTouchIcon, $wgScriptPath, $wgSitename, $wgContLang, $wgScriptExtension; + global $wgFavicon, $wgAppleTouchIcon, $wgScriptPath, $wgScriptExtension; wfProfileIn( __METHOD__ ); @@ -165,16 +165,12 @@ class Skin extends Linker { $out->addLink( array( 'rel' => 'apple-touch-icon', 'href' => $wgAppleTouchIcon ) ); } - $code = $wgContLang->getCode(); - $name = $wgContLang->getLanguageName( $code ); - $langName = $name ? $name : $code; - # OpenSearch description link $out->addLink( array( 'rel' => 'search', 'type' => 'application/opensearchdescription+xml', 'href' => "$wgScriptPath/opensearch_desc{$wgScriptExtension}", - 'title' => "$wgSitename ($langName)", + 'title' => wfMsgForContent( 'opensearch-desc' ), )); $this->addMetadataLinks($out); -- 2.20.1