From 4ea2f561654cb6801e7cfbac5d71fb1543319e01 Mon Sep 17 00:00:00 2001 From: Daniel Friesen Date: Mon, 5 Sep 2011 19:30:11 +0000 Subject: [PATCH] Another thing that's been bothering me, skins shouldn't have to access $wgSitenotice directly when we have a logopath. --- includes/SkinTemplate.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index f66eddf2a3..e0b7eb016f 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -136,7 +136,7 @@ class SkinTemplate extends Skin { global $wgScript, $wgStylePath; global $wgMimeType, $wgJsMimeType; global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces, $wgHtml5Version; - global $wgDisableCounters, $wgLogo, $wgHideInterlanguageLinks; + global $wgDisableCounters, $wgSitename, $wgLogo, $wgHideInterlanguageLinks; global $wgMaxCredits, $wgShowCreditsIfMax; global $wgPageShowWatchingUsers; global $wgUseTrackbacks, $wgUseSiteJs, $wgDebugComments; @@ -291,6 +291,7 @@ class SkinTemplate extends Skin { $tpl->setRef( 'scriptpath', $wgScriptPath ); $tpl->setRef( 'serverurl', $wgServer ); $tpl->setRef( 'logopath', $wgLogo ); + $tpl->setRef( 'sitename', $wgSitename ); $contentlang = $wgContLang->getCode(); $contentdir = $wgContLang->getDir(); -- 2.20.1