r79347 didn't update other callers to mungeQuery(), so let's just take the easy way...

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

diff --git a/skins/Modern.php b/skins/Modern.php
index 899c53e..6cc4fc1 100644 (file)
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -21,15 +21,6 @@ class SkinModern extends SkinTemplate {
        var $skinname = 'modern', $stylename = 'modern',
                $template = 'ModernTemplate', $useHeadElement = true;
 
-       /*
-        * We don't like the default getPoweredBy, the icon clashes with the
-        * skin L&F.
-        */
-       function getPoweredBy() {
-               global  $wgVersion;
-               return "<div class='mw_poweredby'>Powered by MediaWiki $wgVersion</div>";
-       }
-
        function setupSkinUserCss( OutputPage $out ){
                // Do not call parent::setupSkinUserCss(), we have our own print style
                $out->addStyle( 'common/shared.css', 'screen' );
@@ -163,14 +154,10 @@ class ModernTemplate extends MonoBookTemplate {
                <h5><?php $this->msg('personaltools') ?></h5>
                <div class="pBody">
                        <ul>
-<?php                  foreach($this->data['personal_urls'] as $key => $item) { ?>
-                               <li id="<?php echo Sanitizer::escapeId( "pt-$key" ) ?>"<?php
-                                       if ($item['active']) { ?> class="active"<?php } ?>><a href="<?php
-                               echo htmlspecialchars($item['href']) ?>"<?php echo $skin->tooltipAndAccesskey('pt-'.$key) ?><?php
-                               if(!empty($item['class'])) { ?> class="<?php
-                               echo htmlspecialchars($item['class']) ?>"<?php } ?>><?php
-                               echo htmlspecialchars($item['text']) ?></a></li>
-<?php                  } ?>
+<?php          foreach($this->getPersonalTools() as $key => $item) { ?>
+                               <?php echo $this->makeListItem($key, $item); ?>
+
+<?php          } ?>
                        </ul>
                </div>
        </div>
@@ -180,18 +167,26 @@ class ModernTemplate extends MonoBookTemplate {
        <div id="footer"<?php $this->html('userlangattributes') ?>>
                        <ul id="f-list">
 <?php
-               $footerlinks = array(
-                       'lastmod', 'viewcount', 'numberofwatchingusers', 'credits', 'copyright',
-                       'privacy', 'about', 'disclaimer', 'tagline',
-               );
-               foreach( $footerlinks as $aLink ) {
+               foreach( $this->getFooterLinks("flat") as $aLink ) {
                        if( isset( $this->data[$aLink] ) && $this->data[$aLink] ) {
 ?>                             <li id="<?php echo$aLink?>"><?php $this->html($aLink) ?></li>
 <?php          }
                }
 ?>
                        </ul>
-               <?php echo $this->html("poweredbyico"); ?>
+<?php
+               foreach ( $this->getFooterIcons("nocopyright") as $blockName => $footerIcons ) { ?>
+                       <div id="mw_<?php echo htmlspecialchars($blockName); ?>">
+<?php
+                       foreach ( $footerIcons as $icon ) { ?>
+                               <?php echo $this->skin->makeFooterIcon( $icon, 'withoutImage' ); ?>
+
+<?php
+                       } ?>
+                       </div>
+<?php
+               }
+?>
        </div>
 
        <?php $this->html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?>