| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -1129,7 +1129,7 @@ |
| 1130 | 1130 | } |
| 1131 | 1131 | $text = $wgContLang->convertHtml( $title->getText() ); |
| 1132 | 1132 | $this->mCategories[] = $title->getText(); |
| 1133 | | - $this->mCategoryLinks[$type][] = $this->getSkin()->link( $title, $text ); |
| | 1133 | + $this->mCategoryLinks[$type][] = Linker::link( $title, $text ); |
| 1134 | 1134 | } |
| 1135 | 1135 | } |
| 1136 | 1136 | } |
| — | — | @@ -1919,7 +1919,7 @@ |
| 1920 | 1920 | } else { |
| 1921 | 1921 | $this->addDefaultModules(); |
| 1922 | 1922 | |
| 1923 | | - $sk = $this->getSkin( $this->getTitle() ); |
| | 1923 | + $sk = $this->getSkin(); |
| 1924 | 1924 | |
| 1925 | 1925 | // Hook that allows last minute changes to the output page, e.g. |
| 1926 | 1926 | // adding of CSS or Javascript by extensions. |
| — | — | @@ -2035,7 +2035,7 @@ |
| 2036 | 2036 | $this->setArticleRelated( false ); |
| 2037 | 2037 | |
| 2038 | 2038 | $loginTitle = SpecialPage::getTitleFor( 'Userlogin' ); |
| 2039 | | - $loginLink = $this->getSkin()->link( |
| | 2039 | + $loginLink = Linker::link( |
| 2040 | 2040 | $loginTitle, |
| 2041 | 2041 | wfMsgHtml( 'loginreqlink' ), |
| 2042 | 2042 | array(), |
| — | — | @@ -2125,7 +2125,7 @@ |
| 2126 | 2126 | if( $source ) { |
| 2127 | 2127 | $this->setPageTitle( wfMsg( 'viewsource' ) ); |
| 2128 | 2128 | $this->setSubtitle( |
| 2129 | | - wfMsg( 'viewsourcefor', $this->getSkin()->linkKnown( $this->getTitle() ) ) |
| | 2129 | + wfMsg( 'viewsourcefor', Linker::linkKnown( $this->getTitle() ) ) |
| 2130 | 2130 | ); |
| 2131 | 2131 | } else { |
| 2132 | 2132 | $this->setPageTitle( wfMsg( 'badaccess' ) ); |
| — | — | @@ -2150,10 +2150,10 @@ |
| 2151 | 2151 | $this->addHTML( Html::element( 'textarea', $params, $source ) ); |
| 2152 | 2152 | |
| 2153 | 2153 | // Show templates used by this article |
| 2154 | | - $skin = $this->getSkin(); |
| 2155 | 2154 | $article = new Article( $this->getTitle() ); |
| | 2155 | + $templates = Linker::formatTemplates( $article->getUsedTemplates() ); |
| 2156 | 2156 | $this->addHTML( "<div class='templatesUsed'> |
| 2157 | | -{$skin->formatTemplates( $article->getUsedTemplates() )} |
| | 2157 | +$templates |
| 2158 | 2158 | </div> |
| 2159 | 2159 | " ); |
| 2160 | 2160 | } |
| — | — | @@ -2234,7 +2234,7 @@ |
| 2235 | 2235 | $this->addLink( array( 'rel' => 'next', 'href' => $title->getFullURL() ) ); |
| 2236 | 2236 | $link = wfMsgHtml( |
| 2237 | 2237 | 'returnto', |
| 2238 | | - $this->getSkin()->link( $title, $text, array(), $query ) |
| | 2238 | + Linker::link( $title, $text, array(), $query ) |
| 2239 | 2239 | ); |
| 2240 | 2240 | $this->addHTML( "<p id=\"mw-returnto\">{$link}</p>\n" ); |
| 2241 | 2241 | } |