| Index: trunk/phase3/skins/Vector.php |
| — | — | @@ -412,25 +412,10 @@ |
| 413 | 413 | } |
| 414 | 414 | |
| 415 | 415 | // Generate additional footer links |
| 416 | | - $footerlinks = array( |
| 417 | | - 'info' => array( |
| 418 | | - 'lastmod', |
| 419 | | - 'viewcount', |
| 420 | | - 'numberofwatchingusers', |
| 421 | | - 'credits', |
| 422 | | - 'copyright', |
| 423 | | - 'tagline', |
| 424 | | - ), |
| 425 | | - 'places' => array( |
| 426 | | - 'privacy', |
| 427 | | - 'about', |
| 428 | | - 'disclaimer', |
| 429 | | - ), |
| 430 | | - 'icons' => array( |
| 431 | | - 'poweredbyico', |
| 432 | | - 'copyrightico', |
| 433 | | - ), |
| 434 | | - ); |
| | 416 | + $footerlinks = $this->data["footerlinks"]; |
| | 417 | + // footerlinks doesn't include icons for now, so we'll just append the default |
| | 418 | + $footerlinks["icons"] = array( 'poweredbyico', 'copyrightico', ); |
| | 419 | + |
| 435 | 420 | $footerlinksClasses = array( |
| 436 | 421 | 'icons' => array( 'noprint' ) |
| 437 | 422 | ); |
| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -70,6 +70,11 @@ |
| 71 | 71 | // Suppress warnings to prevent notices about missing indexes in $this->data |
| 72 | 72 | wfSuppressWarnings(); |
| 73 | 73 | |
| | 74 | + // Generate additional footer links |
| | 75 | + $footerlinks = $this->data["footerlinks"]; |
| | 76 | + // fold footerlinks into a single array using a bit of trickery |
| | 77 | + $footerlinks = call_user_func_array('array_merge', array_values($footerlinks)); |
| | 78 | + |
| 74 | 79 | $this->html( 'headelement' ); |
| 75 | 80 | ?><div id="globalWrapper"> |
| 76 | 81 | <div id="column-content"><div id="content"<?php $this->html("specialpageattributes") ?>> |
| — | — | @@ -175,10 +180,6 @@ |
| 176 | 181 | <?php } |
| 177 | 182 | |
| 178 | 183 | // Generate additional footer links |
| 179 | | - $footerlinks = array( |
| 180 | | - 'lastmod', 'viewcount', 'numberofwatchingusers', 'credits', 'copyright', |
| 181 | | - 'privacy', 'about', 'disclaimer', 'tagline', |
| 182 | | - ); |
| 183 | 184 | $validFooterLinks = array(); |
| 184 | 185 | foreach( $footerlinks as $aLink ) { |
| 185 | 186 | if( isset( $this->data[$aLink] ) && $this->data[$aLink] ) { |
| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -411,6 +411,21 @@ |
| 412 | 412 | $tpl->set( 'privacy', $this->privacyLink() ); |
| 413 | 413 | $tpl->set( 'about', $this->aboutLink() ); |
| 414 | 414 | |
| | 415 | + $tpl->set( 'footerlinks', array( |
| | 416 | + 'info' => array( |
| | 417 | + 'lastmod', |
| | 418 | + 'viewcount', |
| | 419 | + 'numberofwatchingusers', |
| | 420 | + 'credits', |
| | 421 | + 'copyright', |
| | 422 | + ), |
| | 423 | + 'places' => array( |
| | 424 | + 'privacy', |
| | 425 | + 'about', |
| | 426 | + 'disclaimer', |
| | 427 | + ), |
| | 428 | + ) ); |
| | 429 | + |
| 415 | 430 | if ( $wgDebugComments ) { |
| 416 | 431 | $tpl->setRef( 'debug', $out->mDebugtext ); |
| 417 | 432 | } else { |