| Index: trunk/phase3/skins/Modern.php |
| — | — | @@ -195,7 +195,7 @@ |
| 196 | 196 | <div id="mw_<?php echo htmlspecialchars($blockName); ?>"> |
| 197 | 197 | <?php |
| 198 | 198 | foreach ( $footerIcons as $icon ) { ?> |
| 199 | | - <?php echo $this->skin->makeFooterIcon( $icon, false ); ?> |
| | 199 | + <?php echo $this->skin->makeFooterIcon( $icon, 'withoutImage' ); ?> |
| 200 | 200 | |
| 201 | 201 | <?php |
| 202 | 202 | } ?> |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -1633,18 +1633,18 @@ |
| 1634 | 1634 | /** |
| 1635 | 1635 | * Renders a $wgFooterIcons icon acording to the method's arguments |
| 1636 | 1636 | * @param $icon Array: The icon to build the html for |
| 1637 | | - * @param $useImg Boolean: Whether to use the icon's image or output a text-only footericon |
| | 1637 | + * @param $withImage Boolean: Whether to use the icon's image or output a text-only footericon |
| 1638 | 1638 | */ |
| 1639 | | - function makeFooterIcon( $icon, $useImg = true ) { |
| 1640 | | - if ( is_string($icon) ) { |
| | 1639 | + function makeFooterIcon( $icon, $withImage = 'withImage' ) { |
| | 1640 | + if ( is_string( $icon ) ) { |
| 1641 | 1641 | $html = $icon; |
| 1642 | | - } else { |
| | 1642 | + } else { // Assuming array |
| 1643 | 1643 | $url = $icon["url"]; |
| 1644 | | - unset($icon["url"]); |
| 1645 | | - if ( isset($icon["src"]) && $useImg ) { |
| | 1644 | + unset( $icon["url"] ); |
| | 1645 | + if ( isset( $icon["src"] ) && $withImage === 'withImage' ) { |
| 1646 | 1646 | $html = Html::element( 'img', $icon ); // do this the lazy way, just pass icon data as an attribute array |
| 1647 | 1647 | } else { |
| 1648 | | - $html = htmlspecialchars($icon["alt"]); |
| | 1648 | + $html = htmlspecialchars( $icon["alt"] ); |
| 1649 | 1649 | } |
| 1650 | 1650 | if ( $url ) { |
| 1651 | 1651 | $html = Html::rawElement( 'a', array( "href" => $url ), $html ); |