| Index: trunk/phase3/includes/SkinLegacy.php |
| — | — | @@ -566,18 +566,19 @@ |
| 567 | 567 | } |
| 568 | 568 | |
| 569 | 569 | function printableLink() { |
| 570 | | - global $wgOut, $wgFeedClasses, $wgRequest, $wgLang; |
| | 570 | + global $wgOut, $wgRequest, $wgLang; |
| 571 | 571 | |
| 572 | 572 | $s = array(); |
| 573 | 573 | |
| 574 | 574 | if ( !$wgOut->isPrintable() ) { |
| 575 | | - $printurl = $wgRequest->escapeAppendQuery( 'printable=yes' ); |
| | 575 | + $printurl = htmlspecialchars( $this->getSkin()->getTitle()->getLocalUrl( |
| | 576 | + $wgRequest->appendQueryValue( 'printable', 'yes', true ) ) ); |
| 576 | 577 | $s[] = "<a href=\"$printurl\" rel=\"alternate\">" . wfMsg( 'printableversion' ) . '</a>'; |
| 577 | 578 | } |
| 578 | 579 | |
| 579 | 580 | if ( $wgOut->isSyndicated() ) { |
| 580 | | - foreach ( $wgFeedClasses as $format => $class ) { |
| 581 | | - $feedurl = $wgRequest->escapeAppendQuery( "feed=$format" ); |
| | 581 | + foreach ( $wgOut->getSyndicationLinks() as $format => $link ) { |
| | 582 | + $feedurl = htmlspecialchars( $link ); |
| 582 | 583 | $s[] = "<a href=\"$feedurl\" rel=\"alternate\" type=\"application/{$format}+xml\"" |
| 583 | 584 | . " class=\"feedlink\">" . wfMsgHtml( "feed-$format" ) . "</a>"; |
| 584 | 585 | } |