diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2012-05-03 13:01:35 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2012-05-03 13:01:35 +0200 |
| commit | d9022f63880ce039446fba8364f68e656b7bf4cb (patch) | |
| tree | 16b40fbf17bf7c9ee6f4ead25b16dd192378050a /skins/Modern.php | |
| parent | 27cf83d177256813e2e802241085fce5dd0f3fb9 (diff) | |
Update to MediaWiki 1.19.0
Diffstat (limited to 'skins/Modern.php')
| -rw-r--r-- | skins/Modern.php | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/skins/Modern.php b/skins/Modern.php index c4070b5d..ebd574f4 100644 --- a/skins/Modern.php +++ b/skins/Modern.php @@ -21,6 +21,9 @@ class SkinModern extends SkinTemplate { var $skinname = 'modern', $stylename = 'modern', $template = 'ModernTemplate', $useHeadElement = true; + /** + * @param $out OutputPage + */ function setupSkinUserCss( OutputPage $out ){ parent::setupSkinUserCss( $out ); $out->addModuleStyles ('skins.modern'); @@ -34,10 +37,6 @@ class SkinModern extends SkinTemplate { class ModernTemplate extends MonoBookTemplate { /** - * @var Skin - */ - var $skin; - /** * Template filter callback for Modern skin. * Takes an associative array of data set from a SkinTemplate-based * class, and a wrapper for MediaWiki's localization database, and @@ -46,8 +45,6 @@ class ModernTemplate extends MonoBookTemplate { * @access private */ function execute() { - $this->skin = $skin = $this->data['skin']; - // Suppress warnings to prevent notices about missing indexes in $this->data wfSuppressWarnings(); @@ -55,7 +52,7 @@ class ModernTemplate extends MonoBookTemplate { ?> <!-- heading --> - <div id="mw_header"><h1 id="firstHeading"><?php $this->html('title') ?></h1></div> + <div id="mw_header"><h1 id="firstHeading"><span dir="auto"><?php $this->html('title') ?></span></h1></div> <div id="mw_main"> <div id="mw_contentwrapper"> @@ -134,7 +131,7 @@ class ModernTemplate extends MonoBookTemplate { <div id="mw_<?php echo htmlspecialchars($blockName); ?>"> <?php foreach ( $footerIcons as $icon ) { ?> - <?php echo $this->skin->makeFooterIcon( $icon, 'withoutImage' ); ?> + <?php echo $this->getSkin()->makeFooterIcon( $icon, 'withoutImage' ); ?> <?php } ?> |