https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112425
Revision: 112425 Author: siebrand Date: 2012-02-26 12:02:25 +0000 (Sun, 26 Feb 2012) Log Message: ----------- Follow-up r112014: Remove 1.17 BC linker usage. Modified Paths: -------------- trunk/extensions/Translate/TranslateHooks.php trunk/extensions/Translate/specials/SpecialLanguageStats.php trunk/extensions/Translate/specials/SpecialManageGroups.php trunk/extensions/Translate/specials/SpecialMessageGroupStats.php trunk/extensions/Translate/specials/SpecialTranslate.php trunk/extensions/Translate/tag/PageTranslationHooks.php trunk/extensions/Translate/tag/SpecialPageTranslation.php trunk/extensions/Translate/utils/MessageTable.php trunk/extensions/Translate/utils/StatsTable.php trunk/extensions/Translate/utils/TranslationHelpers.php Modified: trunk/extensions/Translate/TranslateHooks.php =================================================================== --- trunk/extensions/Translate/TranslateHooks.php 2012-02-26 11:49:01 UTC (rev 112424) +++ trunk/extensions/Translate/TranslateHooks.php 2012-02-26 12:02:25 UTC (rev 112425) @@ -313,11 +313,10 @@ global $wgLang, $wgContLang; $language = $forUI === null ? $wgContLang : $wgLang; - $linker = class_exists( 'DummyLinker' ) ? new DummyLinker : new Linker; if ( $action === 'message' ) { $link = $forUI ? - $linker->link( $title, null, array(), array( 'oldid' => $params[0] ) ) : + Linker::link( $title, null, array(), array( 'oldid' => $params[0] ) ) : $title->getPrefixedText(); return wfMessage( 'logentry-translationreview-message' )->params( '', // User link in the new system @@ -339,7 +338,7 @@ $newState = $newStateMessage->isBlank() ? $newState : $newStateMessage->text(); $link = $forUI ? - $linker->link( $title, $groupLabel, array(), array( 'language' => $languageCode ) ) : + Linker::link( $title, $groupLabel, array(), array( 'language' => $languageCode ) ) : $groupLabel; return wfMessage( 'logentry-groupreview-message' )->params( Modified: trunk/extensions/Translate/specials/SpecialLanguageStats.php =================================================================== --- trunk/extensions/Translate/specials/SpecialLanguageStats.php 2012-02-26 11:49:01 UTC (rev 112424) +++ trunk/extensions/Translate/specials/SpecialLanguageStats.php 2012-02-26 12:02:25 UTC (rev 112425) @@ -225,9 +225,8 @@ protected function outputIntroduction() { global $wgOut, $wgLang, $wgUser; - $linker = class_exists( 'DummyLinker' ) ? new DummyLinker : new Linker; $languageName = TranslateUtils::getLanguageName( $this->target, false, $wgLang->getCode() ); - $rcInLangLink = $linker->link( + $rcInLangLink = Linker::link( SpecialPage::getTitleFor( 'Translate', '!recent' ), wfMsgHtml( 'languagestats-recenttranslations' ), array(), Modified: trunk/extensions/Translate/specials/SpecialManageGroups.php =================================================================== --- trunk/extensions/Translate/specials/SpecialManageGroups.php 2012-02-26 11:49:01 UTC (rev 112424) +++ trunk/extensions/Translate/specials/SpecialManageGroups.php 2012-02-26 12:02:25 UTC (rev 112425) @@ -44,7 +44,6 @@ public function execute( $par ) { global $wgRequest; - $linker = class_exists( 'DummyLinker' ) ? new DummyLinker : new Linker; $this->out->setPageTitle( htmlspecialchars( wfMsg( 'translate-managegroups' ) ) ); @@ -102,7 +101,7 @@ wfDebug( __METHOD__ . ": {$group->getId()}\n" ); $id = $group->getId(); - $link = $linker->link( $this->getTitle(), $group->getLabel(), + $link = Linker::link( $this->getTitle(), $group->getLabel(), array( 'id' => "mw-group-$id" ), array( 'group' => $id ) ); $out = $link . $separator; @@ -417,8 +416,7 @@ if ( $code === 'en' ) { $this->doModLangs( $group ); } else { - $linker = class_exists( 'DummyLinker' ) ? new DummyLinker : new Linker; - $this->out->addHTML( '<p>' . $linker->link( + $this->out->addHTML( '<p>' . Linker::link( $this->getTitle(), wfMsgHtml( 'translate-manage-return-to-group' ), array(), @@ -447,8 +445,7 @@ continue; } - $linker = class_exists( 'DummyLinker' ) ? new DummyLinker : new Linker; - $link = $linker->link( + $link = Linker::link( $this->getTitle(), htmlspecialchars( TranslateUtils::getLanguageName( $code, false, $wgLang->getCode() ) . " ($code)" ), array(), @@ -498,14 +495,13 @@ */ protected function setSubtitle( $group, $code ) { global $wgLang; - $linker = class_exists( 'DummyLinker' ) ? new DummyLinker : new Linker; - $links[] = $linker->link( + $links[] = Linker::link( $this->getTitle(), wfMsgHtml( 'translate-manage-subtitle' ) ); - $links[] = $linker->link( + $links[] = Linker::link( $this->getTitle(), htmlspecialchars( $group->getLabel() ), array(), @@ -515,7 +511,7 @@ // Do not show language part for English. if ( $code !== 'en' ) { $langname = TranslateUtils::getLanguageName( $code, false, $wgLang->getCode() ); - $links[] = $linker->link( + $links[] = Linker::link( $this->getTitle(), htmlspecialchars( $langname ), array(), Modified: trunk/extensions/Translate/specials/SpecialMessageGroupStats.php =================================================================== --- trunk/extensions/Translate/specials/SpecialMessageGroupStats.php 2012-02-26 11:49:01 UTC (rev 112424) +++ trunk/extensions/Translate/specials/SpecialMessageGroupStats.php 2012-02-26 12:02:25 UTC (rev 112425) @@ -215,8 +215,7 @@ ); $text = htmlspecialchars( "$code: {$this->names[$code]}" ); - $linker = class_exists( 'DummyLinker' ) ? new DummyLinker : new Linker; - $link = $linker->link( $this->translate, $text, array(), $queryParameters ); + $link = Linker::link( $this->translate, $text, array(), $queryParameters ); return Html::rawElement( 'td', array(), $link ); } } Modified: trunk/extensions/Translate/specials/SpecialTranslate.php =================================================================== --- trunk/extensions/Translate/specials/SpecialTranslate.php 2012-02-26 11:49:01 UTC (rev 112424) +++ trunk/extensions/Translate/specials/SpecialTranslate.php 2012-02-26 12:02:25 UTC (rev 112425) @@ -123,10 +123,9 @@ if ( in_array( $taskid, array( 'untranslated', 'reviewall' ), true ) ) { $hasOptional = count( $this->group->getTags( 'optional' ) ); if ( $hasOptional ) { - $linker = class_exists( 'DummyLinker' ) ? new DummyLinker : new Linker; $linktext = wfMessage( 'translate-page-description-hasoptional-open' )->escaped(); $params = array( 'task' => 'optional' ) + $this->nondefaults; - $link = $linker->link( $this->getTitle(), $linktext, array(), $params ); + $link = Linker::link( $this->getTitle(), $linktext, array(), $params ); $note = wfMessage( 'translate-page-description-hasoptional' )->rawParams( $link )->parseAsBlock(); if ( $description ) { @@ -471,14 +470,12 @@ } private function makeOffsetLink( $label, $offset ) { - $linker = class_exists( 'DummyLinker' ) ? new DummyLinker : new Linker; - $query = array_merge( $this->nondefaults, array( 'offset' => $offset ) ); - $link = $linker->link( + $link = Linker::link( $this->getTitle(), $label, array(), @@ -547,9 +544,7 @@ 'taction' => $this->options['taction'], ); - $linker = class_exists( 'DummyLinker' ) ? new DummyLinker : new Linker; - - $label = $linker->link( + $label = Linker::link( $title, htmlspecialchars( $block->getLabel() ), array(), Modified: trunk/extensions/Translate/tag/PageTranslationHooks.php =================================================================== --- trunk/extensions/Translate/tag/PageTranslationHooks.php 2012-02-26 11:49:01 UTC (rev 112424) +++ trunk/extensions/Translate/tag/PageTranslationHooks.php 2012-02-26 12:02:25 UTC (rev 112425) @@ -205,9 +205,6 @@ $userLangCode = $options->getUserLang(); - // BC for <1.19 - $linker = class_exists( 'DummyLinker' ) ? new DummyLinker : new Linker; - $languages = array(); foreach ( $status as $code => $percent ) { $name = TranslateUtils::getLanguageName( $code, false, $userLangCode ); @@ -241,7 +238,7 @@ if ( $code === $userLangCode ) { $name = Html::rawElement( 'span', array( 'class' => 'mw-pt-languages-ui' ), $name ); } - $languages[] = $linker->linkKnown( $_title, "$name $percent" ); + $languages[] = Linker::linkKnown( $_title, "$name $percent" ); } } @@ -405,7 +402,6 @@ $ready = $page->getReadyTag(); $title = $page->getTitle(); - $linker = class_exists( 'DummyLinker' ) ? new DummyLinker : new Linker; $latest = $title->getLatestRevId(); $canmark = $ready === $latest && $marked !== $latest; @@ -421,7 +417,7 @@ $translate = SpecialPage::getTitleFor( 'Translate' ); $linkDesc = wfMsgHtml( 'translate-tag-translate-link-desc' ); - $actions[] = $linker->link( $translate, $linkDesc, array(), $par ); + $actions[] = Linker::link( $translate, $linkDesc, array(), $par ); } if ( $canmark ) { @@ -433,7 +429,7 @@ // This page has never been marked if ( $marked === false ) { $linkDesc = wfMsgHtml( 'translate-tag-markthis' ); - $actions[] = $linker->link( $translate, $linkDesc, array(), $par ); + $actions[] = Linker::link( $translate, $linkDesc, array(), $par ); } else { $markUrl = $translate->getFullUrl( $par ); $actions[] = wfMsgExt( 'translate-tag-markthisagain', 'parseinline', $diffUrl, $markUrl ); @@ -575,8 +571,9 @@ public static function replaceSubtitle( &$subpages, $skin = null , $out = null ) { global $wgOut; // $out was only added in some MW version - if ( $out === null ) $out = $wgOut; - $linker = class_exists( 'DummyLinker' ) ? new DummyLinker : new Linker; + if ( $out === null ) { + $out = $wgOut; + } if ( !TranslatablePage::isTranslationPage( $out->getTitle() ) && !TranslatablePage::isSourcePage( $out->getTitle() ) ) { @@ -603,7 +600,7 @@ $linkObj = Title::newFromText( $growinglink ); if ( is_object( $linkObj ) && $linkObj->exists() ) { - $getlink = $linker->linkKnown( + $getlink = Linker::linkKnown( SpecialPage::getTitleFor( 'MyLanguage', $growinglink ), htmlspecialchars( $display ) ); Modified: trunk/extensions/Translate/tag/SpecialPageTranslation.php =================================================================== --- trunk/extensions/Translate/tag/SpecialPageTranslation.php 2012-02-26 11:49:01 UTC (rev 112424) +++ trunk/extensions/Translate/tag/SpecialPageTranslation.php 2012-02-26 12:02:25 UTC (rev 112425) @@ -241,7 +241,6 @@ public function listPages() { global $wgOut; $out = $wgOut; - $linker = class_exists( 'DummyLinker' ) ? new DummyLinker : new Linker; $res = $this->loadPagesFromDB(); $allpages = $this->buildPageArray( $res ); @@ -257,7 +256,7 @@ $wgOut->addWikiMsg( 'tpt-new-pages', count( $pages ) ); $out->addHtml( '<ol>' ); foreach ( $pages as $page ) { - $link = $linker->link( $page['title'] ); + $link = Linker::link( $page['title'] ); $acts = $this->actionLinks( $page, 'proposed' ); $out->addHtml( "<li>$link $acts</li>" ); } @@ -270,7 +269,7 @@ $out->addWikiMsg( 'tpt-old-pages', count( $pages ) ); $out->addHtml( '<ol>' ); foreach ( $pages as $page ) { - $link = $linker->link( $page['title'] ); + $link = Linker::link( $page['title'] ); if ( $page['tp:mark'] !== $page['tp:tag'] ) { $link = "<b>$link</b>"; } @@ -287,7 +286,7 @@ $out->addWikiMsg( 'tpt-other-pages', count( $pages ) ); $out->addHtml( '<ol>' ); foreach ( $pages as $page ) { - $link = $linker->link( $page['title'] ); + $link = Linker::link( $page['title'] ); $acts = $this->actionLinks( $page, 'broken' ); $out->addHtml( "<li>$link $acts</li>" ); } @@ -300,7 +299,7 @@ $out->addWikiMsg( 'tpt-discouraged-pages', count( $pages ) ); $out->addHtml( '<ol>' ); foreach ( $pages as $page ) { - $link = $linker->link( $page['title'] ); + $link = Linker::link( $page['title'] ); if ( $page['tp:mark'] !== $page['tp:tag'] ) { $link = "<b>$link</b>"; } @@ -320,7 +319,6 @@ */ protected function actionLinks( array $page, $type ) { $actions = array(); - $linker = class_exists( 'DummyLinker' ) ? new DummyLinker : new Linker; $title = $page['title']; @@ -329,7 +327,7 @@ $pending = $type === 'active' && $page['latest'] !== $page['tp:mark']; if ( $type === 'proposed' || $pending ) { - $actions[] = $linker->link( + $actions[] = Linker::link( $this->getTitle(), wfMsgHtml( 'tpt-rev-mark' ), array( 'title' => wfMsg( 'tpt-rev-mark-tooltip' ) ), @@ -341,7 +339,7 @@ ) ); } elseif ( $type === 'broken' ) { - $actions[] = $linker->link( + $actions[] = Linker::link( $this->getTitle(), wfMsgHtml( 'tpt-rev-unmark' ), array( 'title' => wfMsg( 'tpt-rev-unmark-tooltip' ) ), @@ -355,7 +353,7 @@ } if ( $type === 'active' ) { - $actions[] = $linker->link( + $actions[] = Linker::link( $this->getTitle(), wfMsgHtml( 'tpt-rev-discourage' ), array( 'title' => wfMsg( 'tpt-rev-discourage-tooltip' ) ), @@ -367,7 +365,7 @@ ) ); } elseif ( $type === 'discouraged' ) { - $actions[] = $linker->link( + $actions[] = Linker::link( $this->getTitle(), wfMsgHtml( 'tpt-rev-encourage' ), array( 'title' => wfMsg( 'tpt-rev-encourage-tooltip' ) ), Modified: trunk/extensions/Translate/utils/MessageTable.php =================================================================== --- trunk/extensions/Translate/utils/MessageTable.php 2012-02-26 11:49:01 UTC (rev 112424) +++ trunk/extensions/Translate/utils/MessageTable.php 2012-02-26 12:02:25 UTC (rev 112425) @@ -128,8 +128,7 @@ global $wgLang; $niceTitle = htmlspecialchars( $wgLang->truncate( $title->getPrefixedText(), -35 ) ); - $linker = class_exists( 'DummyLinker' ) ? new DummyLinker() : new Linker(); - $tools['edit'] = $linker->link( + $tools['edit'] = Linker::link( $title, $niceTitle, TranslationEditPage::jsEdit( $title, $this->group->getId() ), Modified: trunk/extensions/Translate/utils/StatsTable.php =================================================================== --- trunk/extensions/Translate/utils/StatsTable.php 2012-02-26 11:49:01 UTC (rev 112424) +++ trunk/extensions/Translate/utils/StatsTable.php 2012-02-26 12:02:25 UTC (rev 112425) @@ -231,8 +231,7 @@ 'title' => $this->getGroupDescription( $group ) ); - $linker = class_exists( 'DummyLinker' ) ? new DummyLinker : new Linker; - $translateGroupLink = $linker->link( + $translateGroupLink = Linker::link( $this->translate, $this->getGroupLabel( $group ), $attributes, $queryParameters ); Modified: trunk/extensions/Translate/utils/TranslationHelpers.php =================================================================== --- trunk/extensions/Translate/utils/TranslationHelpers.php 2012-02-26 11:49:01 UTC (rev 112424) +++ trunk/extensions/Translate/utils/TranslationHelpers.php 2012-02-26 12:02:25 UTC (rev 112425) @@ -684,8 +684,7 @@ $this->mustHaveDefinition(); $en = $this->getDefinition(); - $linker = class_exists( 'DummyLinker' ) ? new DummyLinker : new Linker; - $title = $linker->link( + $title = Linker::link( SpecialPage::getTitleFor( 'Translate' ), htmlspecialchars( $this->group->getLabel() ), array(), @@ -1288,8 +1287,7 @@ $jsEdit = TranslationEditPage::jsEdit( $target, $groupId ); - $linker = class_exists( 'DummyLinker' ) ? new DummyLinker() : new Linker(); - return $linker->link( $target, $text, $jsEdit, $params ); + return Linker::link( $target, $text, $jsEdit, $params ); } /** _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs