From: Platonides <platonides@users.mediawiki.org>
Date: Tue, 24 May 2011 22:56:42 +0000 (+0000)
Subject: Don't generate the footer div if there isn't any footer link.
X-Git-Tag: 1.31.0-rc.0~29964
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/gestion/rappel_supprimer.php?a=commitdiff_plain;h=05ef3df12d11aaf03592dd2c06ef61c8fc461e51;p=lhc%2Fweb%2Fwiklou.git

Don't generate the footer div if there isn't any footer link.
Removed blank line between the <li>s of $validFooterLinks
---

diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index 23d5417711..f57f6eb4e7 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -141,8 +141,18 @@ class MonoBookTemplate extends BaseTemplate {
 ?>
 </div><!-- end of the left (by default at least) column -->
 <div class="visualClear"></div>
+<?php
+	$validFooterIcons = $this->getFooterIcons( "icononly" );
+	$validFooterLinks = $this->getFooterLinks( "flat" ); // Additional footer links
+
+	if ( count( $validFooterIcons ) + count( $validFooterLinks ) > 0 ) { ?>
 <div id="footer"<?php $this->html('userlangattributes') ?>>
-<?php foreach ( $this->getFooterIcons("icononly") as $blockName => $footerIcons ) { ?>
+<?php
+		$footerEnd = '</div>';
+	} else {
+		$footerEnd = '';
+	}
+	foreach ( $validFooterIcons as $blockName => $footerIcons ) { ?>
 	<div id="f-<?php echo htmlspecialchars($blockName); ?>ico">
 <?php foreach ( $footerIcons as $icon ) { ?>
 		<?php echo $this->skin->makeFooterIcon( $icon ); ?>
@@ -152,21 +162,19 @@ class MonoBookTemplate extends BaseTemplate {
 	</div>
 <?php }
 
-		// Generate additional footer links
-		$validFooterLinks = $this->getFooterLinks("flat");
 		if ( count( $validFooterLinks ) > 0 ) {
 ?>	<ul id="f-list">
 <?php
 			foreach( $validFooterLinks as $aLink ) { ?>
 		<li id="<?php echo $aLink ?>"><?php $this->html($aLink) ?></li>
-
 <?php
 			}
 ?>
 	</ul>
 <?php	}
+echo $footerEnd;
 ?>
-</div>
+
 </div>
 <?php
 		$this->printTrail();