| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -70,23 +70,6 @@ |
| 71 | 71 | // Suppress warnings to prevent notices about missing indexes in $this->data |
| 72 | 72 | wfSuppressWarnings(); |
| 73 | 73 | |
| 74 | | - // Generate additional footer icons |
| 75 | | - $footericons = $this->data["footericons"]; |
| 76 | | - // Unset any icons which don't have an image |
| 77 | | - foreach ( $footericons as $footerIconsKey => &$footerIconsBlock ) { |
| 78 | | - foreach ( $footerIconsBlock as $footerIconKey => $footerIcon ) { |
| 79 | | - if ( !is_string($footerIcon) && !isset($footerIcon["src"]) ) { |
| 80 | | - unset($footerIconsBlock[$footerIconKey]); |
| 81 | | - } |
| 82 | | - } |
| 83 | | - } |
| 84 | | - // Redo removal of any empty blocks |
| 85 | | - foreach ( $footericons as $footerIconsKey => &$footerIconsBlock ) { |
| 86 | | - if ( count($footerIconsBlock) <= 0 ) { |
| 87 | | - unset($footericons[$footerIconsKey]); |
| 88 | | - } |
| 89 | | - } |
| 90 | | - |
| 91 | 74 | $this->html( 'headelement' ); |
| 92 | 75 | ?><div id="globalWrapper"> |
| 93 | 76 | <div id="column-content"><div id="content"<?php $this->html("specialpageattributes") ?>> |
| — | — | @@ -183,7 +166,7 @@ |
| 184 | 167 | </div><!-- end of the left (by default at least) column --> |
| 185 | 168 | <div class="visualClear"></div> |
| 186 | 169 | <div id="footer"<?php $this->html('userlangattributes') ?>> |
| 187 | | -<?php foreach ( $footericons as $blockName => $footerIcons ) { ?> |
| | 170 | +<?php foreach ( $this->getFooterIcons("icononly") as $blockName => $footerIcons ) { ?> |
| 188 | 171 | <div id="f-<?php echo htmlspecialchars($blockName); ?>ico"> |
| 189 | 172 | <?php foreach ( $footerIcons as $icon ) { ?> |
| 190 | 173 | <?php echo $this->skin->makeFooterIcon( $icon ); ?> |