From: Daniel Friesen <dantman@users.mediawiki.org>
Date: Tue, 7 Dec 2010 19:58:04 +0000 (+0000)
Subject: Follow up r78003, forgot to make MonoBook use the footericons code.
X-Git-Tag: 1.31.0-rc.0~33470
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=760300fe606dcc4d66683665c56e86e4d54d4a86;p=lhc%2Fweb%2Fwiklou.git

Follow up r78003, forgot to make MonoBook use the footericons code.
---

diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index 7fb73444ef..9c7a0e1213 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -70,23 +70,6 @@ class MonoBookTemplate extends BaseTemplate {
 		// Suppress warnings to prevent notices about missing indexes in $this->data
 		wfSuppressWarnings();
 
-		// Generate additional footer icons
-		$footericons = $this->data["footericons"];
-		// Unset any icons which don't have an image
-		foreach ( $footericons as $footerIconsKey => &$footerIconsBlock ) {
-			foreach ( $footerIconsBlock as $footerIconKey => $footerIcon ) {
-				if ( !is_string($footerIcon) && !isset($footerIcon["src"]) ) {
-					unset($footerIconsBlock[$footerIconKey]);
-				}
-			}
-		}
-		// Redo removal of any empty blocks
-		foreach ( $footericons as $footerIconsKey => &$footerIconsBlock ) {
-			if ( count($footerIconsBlock) <= 0 ) {
-				unset($footericons[$footerIconsKey]);
-			}
-		}
-
 		$this->html( 'headelement' );
 ?><div id="globalWrapper">
 <div id="column-content"><div id="content"<?php $this->html("specialpageattributes") ?>>
@@ -183,7 +166,7 @@ class MonoBookTemplate extends BaseTemplate {
 </div><!-- end of the left (by default at least) column -->
 <div class="visualClear"></div>
 <div id="footer"<?php $this->html('userlangattributes') ?>>
-<?php foreach ( $footericons as $blockName => $footerIcons ) { ?>
+<?php foreach ( $this->getFooterIcons("icononly") as $blockName => $footerIcons ) { ?>
 	<div id="f-<?php echo htmlspecialchars($blockName); ?>ico">
 <?php foreach ( $footerIcons as $icon ) { ?>
 		<?php echo $this->skin->makeFooterIcon( $icon ); ?>