| Index: trunk/extensions/Translate/tag/SpecialPageTranslation.php |
| — | — | @@ -442,7 +442,7 @@ |
| 443 | 443 | public function showPage( TranslatablePage $page, Array $sections ) { |
| 444 | 444 | global $wgOut, $wgContLang; |
| 445 | 445 | |
| 446 | | - $wgOut->setSubtitle( $this->user->getSkin()->link( $page->getTitle() ) ); |
| | 446 | + $wgOut->setSubtitle( Linker::link( $page->getTitle() ) ); |
| 447 | 447 | $wgOut->addModules( 'ext.translate.special.pagetranslation' ); |
| 448 | 448 | |
| 449 | 449 | $wgOut->addWikiMsg( 'tpt-showpage-intro' ); |
| Index: trunk/extensions/Translate/utils/TranslationHelpers.php |
| — | — | @@ -1152,13 +1152,11 @@ |
| 1153 | 1153 | * @return string |
| 1154 | 1154 | */ |
| 1155 | 1155 | protected function doBox( $msg, $code, $title = false, $makelink = false ) { |
| 1156 | | - global $wgUser, $wgLang; |
| | 1156 | + global $wgLang; |
| 1157 | 1157 | |
| 1158 | 1158 | $name = TranslateUtils::getLanguageName( $code, false, $wgLang->getCode() ); |
| 1159 | 1159 | $code = wfBCP47( $code ); |
| 1160 | 1160 | |
| 1161 | | - $skin = $wgUser->getSkin(); |
| 1162 | | - |
| 1163 | 1161 | $attributes = array(); |
| 1164 | 1162 | if ( !$title ) { |
| 1165 | 1163 | $attributes['class'] = 'mw-sp-translate-in-other-big'; |
| — | — | @@ -1180,7 +1178,7 @@ |
| 1181 | 1179 | |
| 1182 | 1180 | if ( $makelink ) { |
| 1183 | 1181 | $linkTitle = Title::newFromText( $makelink ); |
| 1184 | | - $title = $skin->link( |
| | 1182 | + $title = Linker::link( |
| 1185 | 1183 | $linkTitle, |
| 1186 | 1184 | htmlspecialchars( $title ), |
| 1187 | 1185 | array(), |
| Index: trunk/extensions/Translate/utils/ToolBox.php |
| — | — | @@ -25,6 +25,7 @@ |
| 26 | 26 | static function toolboxAllTranslations( &$skin ) { |
| 27 | 27 | global $wgTranslateMessageNamespaces; |
| 28 | 28 | |
| | 29 | + // @todo Remove BC code. |
| 29 | 30 | if ( method_exists( $skin, 'getSkin' ) ) { |
| 30 | 31 | $title = $skin->getSkin()->getTitle(); |
| 31 | 32 | } else { |
| Index: trunk/extensions/Translate/specials/SpecialSupportedLanguages.php |
| — | — | @@ -77,10 +77,7 @@ |
| 78 | 78 | $this->preQueryUsers( $users ); |
| 79 | 79 | |
| 80 | 80 | list( $editcounts, $lastedits ) = $this->getUserStats(); |
| 81 | | - global $wgUser; |
| 82 | 81 | |
| 83 | | - $skin = $wgUser->getSkin(); |
| 84 | | - |
| 85 | 82 | // Information to be used inside the foreach loop. |
| 86 | 83 | $linkInfo['rc']['title'] = SpecialPage::getTitleFor( 'Recentchanges' ); |
| 87 | 84 | $linkInfo['rc']['msg'] = wfMsg( 'supportedlanguages-recenttranslations' ); |
| — | — | @@ -103,7 +100,7 @@ |
| 104 | 101 | $wgOut->addHtml( Html::openElement( 'h2', array( 'id' => $code ) ) ); |
| 105 | 102 | if ( defined( 'NS_PORTAL' ) ) { |
| 106 | 103 | $portalTitle = Title::makeTitleSafe( NS_PORTAL, $code ); |
| 107 | | - $wgOut->addHtml( $skin->linkKnown( $portalTitle, $headerText ) ); |
| | 104 | + $wgOut->addHtml( Linker::linkKnown( $portalTitle, $headerText ) ); |
| 108 | 105 | } else { |
| 109 | 106 | $wgOut->addHtml( $headerText ); |
| 110 | 107 | } |
| — | — | @@ -112,7 +109,7 @@ |
| 113 | 110 | |
| 114 | 111 | // Add useful links for language stats and recent changes for the language. |
| 115 | 112 | $links = array(); |
| 116 | | - $links[] = $skin->link( |
| | 113 | + $links[] = Linker::link( |
| 117 | 114 | $linkInfo['stats']['title'], |
| 118 | 115 | $linkInfo['stats']['msg'], |
| 119 | 116 | array(), |
| — | — | @@ -122,7 +119,7 @@ |
| 123 | 120 | ), |
| 124 | 121 | array( 'known', 'noclasses' ) |
| 125 | 122 | ); |
| 126 | | - $links[] = $skin->link( |
| | 123 | + $links[] = Linker::link( |
| 127 | 124 | $linkInfo['rc']['title'], |
| 128 | 125 | $linkInfo['rc']['msg'], |
| 129 | 126 | array(), |
| — | — | @@ -270,8 +267,7 @@ |
| 271 | 268 | } |
| 272 | 269 | |
| 273 | 270 | protected function makeUserList( $users, $editcounts, $lastedits ) { |
| 274 | | - global $wgOut, $wgLang, $wgUser; |
| 275 | | - $skin = $wgUser->getSkin(); |
| | 271 | + global $wgOut, $wgLang; |
| 276 | 272 | |
| 277 | 273 | $day = 60 * 60 * 24; |
| 278 | 274 | |
| — | — | @@ -306,7 +302,7 @@ |
| 307 | 303 | $stylestr = $this->formatStyle( $styles ); |
| 308 | 304 | if ( $stylestr ) $attribs['style'] = $stylestr; |
| 309 | 305 | |
| 310 | | - $links[] = $skin->link( $title, $enc, $attribs ); |
| | 306 | + $links[] = Linker::link( $title, $enc, $attribs ); |
| 311 | 307 | } |
| 312 | 308 | |
| 313 | 309 | $wgOut->addHTML( "<p class='mw-translate-spsl-translators'>" . wfMsgExt( |
| Index: trunk/extensions/Translate/specials/SpecialTranslations.php |
| — | — | @@ -136,8 +136,6 @@ |
| 137 | 137 | function showTranslations( Title $title ) { |
| 138 | 138 | global $wgOut, $wgUser, $wgLang; |
| 139 | 139 | |
| 140 | | - $sk = $wgUser->getSkin(); |
| 141 | | - |
| 142 | 140 | $namespace = $title->getNamespace(); |
| 143 | 141 | $message = $title->getDBkey(); |
| 144 | 142 | |
| — | — | @@ -212,10 +210,10 @@ |
| 213 | 211 | $text |
| 214 | 212 | ); |
| 215 | 213 | } else { |
| 216 | | - $tools['edit'] = $sk->link( $tTitle, $text ); |
| | 214 | + $tools['edit'] = Linker::link( $tTitle, $text ); |
| 217 | 215 | } |
| 218 | 216 | |
| 219 | | - $tools['history'] = $sk->link( |
| | 217 | + $tools['history'] = Linker::link( |
| 220 | 218 | $tTitle, |
| 221 | 219 | $historyText, |
| 222 | 220 | array( |
| Index: trunk/extensions/Translate/specials/SpecialFirstSteps.php |
| — | — | @@ -16,13 +16,7 @@ |
| 17 | 17 | * @ingroup SpecialPage TranslateSpecialPage |
| 18 | 18 | */ |
| 19 | 19 | class SpecialFirstSteps extends UnlistedSpecialPage { |
| 20 | | - |
| 21 | 20 | /** |
| 22 | | - * @var Skin |
| 23 | | - */ |
| 24 | | - protected $skin; |
| 25 | | - |
| 26 | | - /** |
| 27 | 21 | * @var User |
| 28 | 22 | */ |
| 29 | 23 | protected $user; |
| — | — | @@ -40,7 +34,6 @@ |
| 41 | 35 | global $wgOut, $wgUser; |
| 42 | 36 | $this->out = $wgOut; |
| 43 | 37 | $this->user = $wgUser; |
| 44 | | - $this->skin = $wgUser->getSkin(); |
| 45 | 38 | |
| 46 | 39 | $this->out->addWikiMsg( 'translate-fs-intro' ); |
| 47 | 40 | $step = false; |