| Index: trunk/phase3/includes/QueryPage.php |
| — | — | @@ -760,8 +760,8 @@ |
| 761 | 761 | if ( $title instanceof Title ) { |
| 762 | 762 | if ( $this->isCached() || $this->forceExistenceCheck() ) { |
| 763 | 763 | $pageLink = $title->isKnown() |
| 764 | | - ? '<del>' . $skin->link( $title ) . '</del>' |
| 765 | | - : $skin->link( |
| | 764 | + ? '<del>' . Linker::link( $title ) . '</del>' |
| | 765 | + : Linker::link( |
| 766 | 766 | $title, |
| 767 | 767 | null, |
| 768 | 768 | array(), |
| — | — | @@ -769,7 +769,7 @@ |
| 770 | 770 | array( 'broken' ) |
| 771 | 771 | ); |
| 772 | 772 | } else { |
| 773 | | - $pageLink = $skin->link( |
| | 773 | + $pageLink = Linker::link( |
| 774 | 774 | $title, |
| 775 | 775 | null, |
| 776 | 776 | array(), |
| — | — | @@ -777,10 +777,9 @@ |
| 778 | 778 | array( 'broken' ) |
| 779 | 779 | ); |
| 780 | 780 | } |
| 781 | | - return $this->getLang()->specialList( $pageLink, $this->makeWlhLink( $title, $skin, $result ) ); |
| | 781 | + return $this->getLang()->specialList( $pageLink, $this->makeWlhLink( $title, $result ) ); |
| 782 | 782 | } else { |
| 783 | | - $tsafe = htmlspecialchars( $result->title ); |
| 784 | | - return wfMsgHtml( 'wantedpages-badtitle', $tsafe ); |
| | 783 | + return $this->msg( 'wantedpages-badtitle', $result->title )->escaped(); |
| 785 | 784 | } |
| 786 | 785 | } |
| 787 | 786 | |
| — | — | @@ -788,14 +787,12 @@ |
| 789 | 788 | * Make a "what links here" link for a given title |
| 790 | 789 | * |
| 791 | 790 | * @param $title Title to make the link for |
| 792 | | - * @param $skin Skin object to use |
| 793 | 791 | * @param $result Object: result row |
| 794 | 792 | * @return string |
| 795 | 793 | */ |
| 796 | | - private function makeWlhLink( $title, $skin, $result ) { |
| 797 | | - $wlh = SpecialPage::getTitleFor( 'Whatlinkshere' ); |
| 798 | | - $label = wfMsgExt( 'nlinks', array( 'parsemag', 'escape' ), |
| 799 | | - $this->getLang()->formatNum( $result->value ) ); |
| 800 | | - return $skin->link( $wlh, $label, array(), array( 'target' => $title->getPrefixedText() ) ); |
| | 794 | + private function makeWlhLink( $title, $result ) { |
| | 795 | + $wlh = SpecialPage::getTitleFor( 'Whatlinkshere', $title->getPrefixedText() ); |
| | 796 | + $label = $this->msg( 'nlinks' )->numParams( $result->value )->escaped(); |
| | 797 | + return Linker::link( $wlh, $label ); |
| 801 | 798 | } |
| 802 | 799 | } |