Follow up to r105114

[lhc/web/wiklou.git] / skins / Modern.php

diff --git a/skins/Modern.php b/skins/Modern.php
index f82ea09..74f9b30 100644 (file)
--- 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');
@@ -33,10 +36,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
@@ -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();
 
@@ -85,8 +82,6 @@ class ModernTemplate extends MonoBookTemplate {
                <?php if($this->data['showjumplinks']) { ?><div id="jump-to-nav"><?php $this->msg('jumpto') ?> <a href="#mw_portlets"><?php $this->msg('jumptonavigation') ?></a>, <a href="#searchInput"><?php $this->msg('jumptosearch') ?></a></div><?php } ?>
 
                <?php $this->html('bodytext') ?>
-               <?php if($this->data['printfooter']) { ?><div class="printfooter"><?php $this->html('printfooter'); ?></div><?php } ?>
-               <?php $this->html('debughtml'); ?>
                <div class='mw_clear'></div>
                <?php if($this->data['catlinks']) { $this->html('catlinks'); } ?>
                <?php $this->html ('dataAfterContent') ?>
@@ -136,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
                        } ?>