http://www.mediawiki.org/wiki/Special:Code/MediaWiki/60799
Revision: 60799
Author: tparscal
Date: 2010-01-07 18:59:07 +0000 (Thu, 07 Jan 2010)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/phase3/includes/SkinTemplate.php
trunk/phase3/skins/Modern.php
trunk/phase3/skins/MonoBook.php
trunk/phase3/skins/Vector.php
Modified: trunk/phase3/includes/SkinTemplate.php
===================================================================
--- trunk/phase3/includes/SkinTemplate.php 2010-01-07 18:55:18 UTC (rev
60798)
+++ trunk/phase3/includes/SkinTemplate.php 2010-01-07 18:59:07 UTC (rev
60799)
@@ -305,9 +305,6 @@
$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();
Modified: trunk/phase3/skins/Modern.php
===================================================================
--- trunk/phase3/skins/Modern.php 2010-01-07 18:55:18 UTC (rev 60798)
+++ trunk/phase3/skins/Modern.php 2010-01-07 18:59:07 UTC (rev 60799)
@@ -113,7 +113,7 @@
<!-- 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>
Modified: trunk/phase3/skins/MonoBook.php
===================================================================
--- trunk/phase3/skins/MonoBook.php 2010-01-07 18:55:18 UTC (rev 60798)
+++ trunk/phase3/skins/MonoBook.php 2010-01-07 18:59:07 UTC (rev 60799)
@@ -81,7 +81,7 @@
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>
Modified: trunk/phase3/skins/Vector.php
===================================================================
--- trunk/phase3/skins/Vector.php 2010-01-07 18:55:18 UTC (rev 60798)
+++ trunk/phase3/skins/Vector.php 2010-01-07 18:59:07 UTC (rev 60799)
@@ -463,7 +463,7 @@
<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'] ): ?>
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
