From e7ee1f5dd55333245d9d413a35781fdcd6ce40db Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Sat, 13 Oct 2007 11:24:50 +0000 Subject: [PATCH] * Use proper function instead of a global --- includes/Skin.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/includes/Skin.php b/includes/Skin.php index f9e1705779..2b90bd9f21 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -156,21 +156,22 @@ class Skin extends Linker { } function initPage( &$out ) { - global $wgFavicon, $wgScriptPath, $wgSitename, $wgLanguageCode, $wgLanguageNames; + global $wgFavicon, $wgScriptPath, $wgSitename, $wgLanguageCode; - $fname = 'Skin::initPage'; - wfProfileIn( $fname ); + wfProfileIn( __METHOD__ ); if( false !== $wgFavicon ) { $out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) ); } + $names = Language::getLanguageNames(); + # OpenSearch description link $out->addLink( array( 'rel' => 'search', 'type' => 'application/opensearchdescription+xml', 'href' => "$wgScriptPath/opensearch_desc.php", - 'title' => "$wgSitename ({$wgLanguageNames[$wgLanguageCode]})", + 'title' => "$wgSitename ({$names[$wgLanguageCode]})", )); $this->addMetadataLinks($out); @@ -179,7 +180,7 @@ class Skin extends Linker { $this->preloadExistence(); - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); } /** -- 2.20.1