| Index: branches/nikola/phase3/skins/Vector.php |
| — | — | @@ -263,7 +263,7 @@ |
| 264 | 264 | break; |
| 265 | 265 | case 'LANGUAGES': |
| 266 | 266 | if ( $this->data['language_urls'] ) { |
| 267 | | - $this->renderPortal("lang", $this->data['language_urls'], "otherlanguages", "SkinTemplateLanguageBoxEnd"); |
| | 267 | + $this->renderPortal("lang", $this->data['language_urls'], "otherlanguages"); |
| 268 | 268 | } |
| 269 | 269 | break; |
| 270 | 270 | default: |
| Index: branches/nikola/phase3/skins/MonoBook.php |
| — | — | @@ -268,10 +268,7 @@ |
| 269 | 269 | <?php foreach($this->data['language_urls'] as $key => $langlink) { ?> |
| 270 | 270 | <?php echo $this->makeListItem($key, $langlink); ?> |
| 271 | 271 | |
| 272 | | -<?php |
| 273 | | - } |
| 274 | | - wfRunHooks( 'SkinTemplateLanguageBoxEnd', array( &$this ) ); |
| 275 | | -?> |
| | 272 | +<?php } ?> |
| 276 | 273 | </ul> |
| 277 | 274 | </div> |
| 278 | 275 | </div> |
| Index: branches/nikola/phase3/includes/SkinTemplate.php |
| — | — | @@ -1577,6 +1577,8 @@ |
| 1578 | 1578 | * (however the link will still support a tooltip and accesskey from it) |
| 1579 | 1579 | * If you need an id or class on a single link you should include a "links" |
| 1580 | 1580 | * array with just one link item inside of it. |
| | 1581 | + * You can also include "before" and/or "after" keys for HTML |
| | 1582 | + * that will come before or after the link. |
| 1581 | 1583 | */ |
| 1582 | 1584 | function makeListItem( $key, $item, $options = array() ) { |
| 1583 | 1585 | if ( isset( $item['links'] ) ) { |
| — | — | @@ -1600,6 +1602,9 @@ |
| 1601 | 1603 | $html = $this->makeLink( $key, $link ); |
| 1602 | 1604 | } |
| 1603 | 1605 | |
| | 1606 | + if( isset( $item['before'] ) ) $html = $item['before'] . $html; |
| | 1607 | + if( isset( $item['after'] ) ) $html .= $item['after']; |
| | 1608 | + |
| 1604 | 1609 | $attrs = array(); |
| 1605 | 1610 | foreach ( array( 'id', 'class' ) as $attr ) { |
| 1606 | 1611 | if ( isset( $item[$attr] ) ) { |