r60799 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r60798‎ | r60799 | r60800 >
Date:18:59, 7 January 2010
Author:tparscal
Status:resolved
Tags:
Comment:
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 (modified) (history)
  • /trunk/phase3/skins/Modern.php (modified) (history)
  • /trunk/phase3/skins/MonoBook.php (modified) (history)
  • /trunk/phase3/skins/Vector.php (modified) (history)

Diff [purge]

Index: trunk/phase3/skins/Vector.php
@@ -463,7 +463,7 @@
464464 <div id="page-base" class="noprint"></div>
465465 <div id="head-base" class="noprint"></div>
466466 <!-- content -->
467 - <div id="content" <?php $this->html('specialpageattributes') ?>>
 467+ <div id="content" <?php $this->html('userlangattributes') ?>>
468468 <a id="top"></a>
469469 <div id="mw-js-message" style="display:none;" <?php $this->html('userlangattributes') ?>></div>
470470 <?php if ( $this->data['sitenotice'] ): ?>
Index: trunk/phase3/skins/MonoBook.php
@@ -81,7 +81,7 @@
8282 class="mediawiki <?php $this->text('dir'); $this->text('capitalizeallnouns') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>">
8383 <div id="globalWrapper">
8484 <div id="column-content">
85 - <div id="content" <?php $this->html("specialpageattributes") ?>>
 85+ <div id="content" <?php $this->html("userlangattributes") ?>>
8686 <a id="top"></a>
8787 <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
8888 <h1 id="firstHeading" class="firstHeading"><?php $this->html('title') ?></h1>
Index: trunk/phase3/skins/Modern.php
@@ -113,7 +113,7 @@
114114 <!-- contentholder does nothing by default, but it allows users to style the text inside
115115 the content area without affecting the meaning of 'em' in #mw_content, which is used
116116 for the margins -->
117 - <div id="mw_contentholder" <?php $this->html("specialpageattributes") ?>>
 117+ <div id="mw_contentholder" <?php $this->html("userlangattributes") ?>>
118118 <div class='mw-topboxes'>
119119 <div id="mw-js-message" style="display:none;" <?php $this->html('userlangattributes')?>></div>
120120 <div class="mw-topbox" id="siteSub"><?php $this->msg('tagline') ?></div>
Index: trunk/phase3/includes/SkinTemplate.php
@@ -305,9 +305,6 @@
306306 $tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href'] );
307307 $tpl->set( 'userlang', $wgLang->getCode() );
308308 $tpl->set( 'userlangattributes', 'lang="' . $wgLang->getCode() . '" xml:lang="' . $wgLang->getCode() . '" dir="' . $wgLang->getDir() . '"');
309 - if($this->mTitle->isSpecialPage()) {
310 - $tpl->set( 'specialpageattributes', 'lang="' . $wgLang->getCode() . '" xml:lang="' . $wgLang->getCode() . '" dir="' . $wgLang->getDir() . '"');
311 - }
312309
313310 $newtalks = $wgUser->getNewMessageLinks();
314311

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r60786Make LTR wgLang do the right thing on RTL wgContLang wikis. See bug 6100 and...mah09:32, 7 January 2010

Status & tagging log