From 41dbba42fb598b4ae3a0e92dede04163c6577f66 Mon Sep 17 00:00:00 2001 From: Trevor Parscal Date: Thu, 7 Jan 2010 18:59:07 +0000 Subject: [PATCH] In r60786 mah added 'specialpageattributes' to the skin, only in the case of the title being a special page, and filled it with the same information as 'userlangattributes'. Then added some uses of 'specialpageattributes' to all three SkinTemplate based skins, which were using that data on all pages - resulting in an error. This corrects this problem. --- includes/SkinTemplate.php | 3 --- skins/Modern.php | 2 +- skins/MonoBook.php | 2 +- skins/Vector.php | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index 3c52dcd863..1566f26e82 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -305,9 +305,6 @@ class SkinTemplate extends Skin { $tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href'] ); $tpl->set( 'userlang', $wgLang->getCode() ); $tpl->set( 'userlangattributes', 'lang="' . $wgLang->getCode() . '" xml:lang="' . $wgLang->getCode() . '" dir="' . $wgLang->getDir() . '"'); - if($this->mTitle->isSpecialPage()) { - $tpl->set( 'specialpageattributes', 'lang="' . $wgLang->getCode() . '" xml:lang="' . $wgLang->getCode() . '" dir="' . $wgLang->getDir() . '"'); - } $newtalks = $wgUser->getNewMessageLinks(); diff --git a/skins/Modern.php b/skins/Modern.php index aa95adc9d1..04d2b721ba 100644 --- a/skins/Modern.php +++ b/skins/Modern.php @@ -113,7 +113,7 @@ class ModernTemplate extends QuickTemplate { -
html("specialpageattributes") ?>> +
html("userlangattributes") ?>>
msg('tagline') ?>
diff --git a/skins/MonoBook.php b/skins/MonoBook.php index 3c2c1a30ec..a90250fba1 100644 --- a/skins/MonoBook.php +++ b/skins/MonoBook.php @@ -81,7 +81,7 @@ class MonoBookTemplate extends QuickTemplate { class="mediawiki text('dir'); $this->text('capitalizeallnouns') ?> text('pageclass') ?> text('skinnameclass') ?>">
-
html("specialpageattributes") ?>> +
html("userlangattributes") ?>> data['sitenotice']) { ?>
html('sitenotice') ?>

html('title') ?>

diff --git a/skins/Vector.php b/skins/Vector.php index fc9f3c3539..56481cada5 100644 --- a/skins/Vector.php +++ b/skins/Vector.php @@ -463,7 +463,7 @@ class VectorTemplate extends QuickTemplate {
-
html('specialpageattributes') ?>> +
html('userlangattributes') ?>> data['sitenotice'] ): ?> -- 2.20.1