From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Thu, 7 Jan 2010 18:59:07 +0000 (+0000)
Subject: In r60786 mah added 'specialpageattributes' to the skin, only in the case of the... 
X-Git-Tag: 1.31.0-rc.0~38367
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=41dbba42fb598b4ae3a0e92dede04163c6577f66;p=lhc%2Fweb%2Fwiklou.git

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.
---

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 {
 	<!-- contentholder does nothing by default, but it allows users to style the text inside
 	     the content area without affecting the meaning of 'em' in #mw_content, which is used
 	     for the margins -->
-	<div id="mw_contentholder" <?php $this->html("specialpageattributes") ?>>
+	<div id="mw_contentholder" <?php $this->html("userlangattributes") ?>>
 		<div class='mw-topboxes'>
 			<div id="mw-js-message" style="display:none;" <?php $this->html('userlangattributes')?>></div>
 			<div class="mw-topbox" id="siteSub"><?php $this->msg('tagline') ?></div>
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 <?php $this->text('dir'); $this->text('capitalizeallnouns') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>">
 	<div id="globalWrapper">
 		<div id="column-content">
-	<div id="content" <?php $this->html("specialpageattributes") ?>>
+	<div id="content" <?php $this->html("userlangattributes") ?>>
 		<a id="top"></a>
 		<?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
 		<h1 id="firstHeading" class="firstHeading"><?php $this->html('title') ?></h1>
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 {
 		<div id="page-base" class="noprint"></div>
 		<div id="head-base" class="noprint"></div>
 		<!-- content -->
-		<div id="content" <?php $this->html('specialpageattributes') ?>>
+		<div id="content" <?php $this->html('userlangattributes') ?>>
 			<a id="top"></a>
 			<div id="mw-js-message" style="display:none;" <?php $this->html('userlangattributes') ?>></div>
 			<?php if ( $this->data['sitenotice'] ): ?>