X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fskins%2FSkin.php;h=f45596f3fd2663804e024beabee4c061488662bf;hp=86a1c4c94b5c96b149f6c788b66d75ec57d22a34;hb=447574ceb746c2f4026a8bf77632bdc4604314bb;hpb=9f5c319b091fc84796c1e841699cc70c7566bef7 diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php index 86a1c4c94b..f45596f3fd 100644 --- a/includes/skins/Skin.php +++ b/includes/skins/Skin.php @@ -55,7 +55,8 @@ abstract class Skin extends ContextSource { * @return array Associative array of strings */ static function getSkinNames() { - return SkinFactory::getDefaultInstance()->getSkinNames(); + $skinFactory = MediaWikiServices::getInstance()->getSkinFactory(); + return $skinFactory->getSkinNames(); } /** @@ -215,6 +216,7 @@ abstract class Skin extends ContextSource { // Preload jquery.tablesorter for mediawiki.page.ready if ( strpos( $out->getHTML(), 'sortable' ) !== false ) { $modules['content'][] = 'jquery.tablesorter'; + $modules['styles']['content'][] = 'jquery.tablesorter.styles'; } // Preload jquery.makeCollapsible for mediawiki.page.ready @@ -517,6 +519,7 @@ abstract class Skin extends ContextSource { function getCategoryLinks() { $out = $this->getOutput(); $allCats = $out->getCategoryLinks(); + $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer(); if ( $allCats === [] ) { return ''; @@ -531,10 +534,10 @@ abstract class Skin extends ContextSource { if ( !empty( $allCats['normal'] ) ) { $t = $embed . implode( $pop . $embed, $allCats['normal'] ) . $pop; - $msg = $this->msg( 'pagecategories' )->numParams( count( $allCats['normal'] ) )->escaped(); + $msg = $this->msg( 'pagecategories' )->numParams( count( $allCats['normal'] ) ); $linkPage = $this->msg( 'pagecategorieslink' )->inContentLanguage()->text(); $title = Title::newFromText( $linkPage ); - $link = $title ? Linker::link( $title, $msg ) : $msg; + $link = $title ? $linkRenderer->makeLink( $title, $msg->text() ) : $msg->escaped(); $s .= ''; } @@ -582,6 +585,7 @@ abstract class Skin extends ContextSource { */ function drawCategoryBrowser( $tree ) { $return = ''; + $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer(); foreach ( $tree as $element => $parent ) { if ( empty( $parent ) ) { @@ -594,7 +598,7 @@ abstract class Skin extends ContextSource { # add our current element to the list $eltitle = Title::newFromText( $element ); - $return .= Linker::link( $eltitle, htmlspecialchars( $eltitle->getText() ) ); + $return .= $linkRenderer->makeLink( $eltitle, $eltitle->getText() ); } return $return; @@ -716,6 +720,7 @@ abstract class Skin extends ContextSource { function getUndeleteLink() { $action = $this->getRequest()->getVal( 'action', 'view' ); $title = $this->getTitle(); + $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer(); if ( ( !$title->exists() || $action == 'history' ) && $title->quickUserCan( 'deletedhistory', $this->getUser() ) @@ -730,9 +735,9 @@ abstract class Skin extends ContextSource { } return $this->msg( $msg )->rawParams( - Linker::linkKnown( + $linkRenderer->makeKnownLink( SpecialPage::getTitleFor( 'Undelete', $this->getTitle()->getPrefixedDBkey() ), - $this->msg( 'restorelink' )->numParams( $n )->escaped() ) + $this->msg( 'restorelink' )->numParams( $n )->text() ) )->escaped(); } } @@ -745,6 +750,7 @@ abstract class Skin extends ContextSource { * @return string */ function subPageSubtitle( $out = null ) { + $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer(); if ( $out === null ) { $out = $this->getOutput(); } @@ -774,9 +780,8 @@ abstract class Skin extends ContextSource { $linkObj = Title::newFromText( $growinglink ); if ( is_object( $linkObj ) && $linkObj->isKnown() ) { - $getlink = Linker::linkKnown( - $linkObj, - htmlspecialchars( $display ) + $getlink = $linkRenderer->makeKnownLink( + $linkObj, $display ); $c++; @@ -820,6 +825,7 @@ abstract class Skin extends ContextSource { * @return string */ function getCopyright( $type = 'detect' ) { + $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer(); if ( $type == 'detect' ) { if ( !$this->isRevisionCurrent() && !$this->msg( 'history_copyright' )->inContentLanguage()->isDisabled() @@ -840,7 +846,9 @@ abstract class Skin extends ContextSource { if ( $config->get( 'RightsPage' ) ) { $title = Title::newFromText( $config->get( 'RightsPage' ) ); - $link = Linker::linkKnown( $title, $config->get( 'RightsText' ) ); + $link = $linkRenderer->makeKnownLink( + $title, new HtmlArmor( $config->get( 'RightsText' ) ) + ); } elseif ( $config->get( 'RightsUrl' ) ) { $link = Linker::makeExternalLink( $config->get( 'RightsUrl' ), $config->get( 'RightsText' ) ); } elseif ( $config->get( 'RightsText' ) ) { @@ -906,7 +914,7 @@ abstract class Skin extends ContextSource { $url2 = htmlspecialchars( "$resourceBasePath/resources/assets/poweredby_mediawiki_176x62.png" ); - $text = 'Powered by MediaWiki'; Hooks::run( 'SkinGetPoweredBy', [ &$text, $this ] ); @@ -996,9 +1004,10 @@ abstract class Skin extends ContextSource { * @return string */ function mainPageLink() { - $s = Linker::linkKnown( + $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer(); + $s = $linkRenderer->makeKnownLink( Title::newMainPage(), - $this->msg( 'mainpage' )->escaped() + $this->msg( 'mainpage' )->text() ); return $s; @@ -1012,13 +1021,14 @@ abstract class Skin extends ContextSource { */ public function footerLink( $desc, $page ) { $title = $this->footerLinkTitle( $desc, $page ); + $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer(); if ( !$title ) { return ''; } - return Linker::linkKnown( + return $linkRenderer->makeKnownLink( $title, - $this->msg( $desc )->escaped() + $this->msg( $desc )->text() ); } @@ -1438,6 +1448,7 @@ abstract class Skin extends ContextSource { $user = $this->getUser(); $newtalks = $user->getNewMessageLinks(); $out = $this->getOutput(); + $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer(); // Allow extensions to disable or modify the new messages alert if ( !Hooks::run( 'GetNewMessagesAlert', [ &$newMessagesAlert, $newtalks, $user, $out ] ) ) { @@ -1468,16 +1479,16 @@ abstract class Skin extends ContextSource { // 999 signifies "more than one revision". We don't know how many, and even if we did, // the number of revisions or authors is not necessarily the same as the number of // "messages". - $newMessagesLink = Linker::linkKnown( + $newMessagesLink = $linkRenderer->makeKnownLink( $uTalkTitle, - $this->msg( 'newmessageslinkplural' )->params( $plural )->escaped(), + $this->msg( 'newmessageslinkplural' )->params( $plural )->text(), [], $uTalkTitle->isRedirect() ? [ 'redirect' => 'no' ] : [] ); - $newMessagesDiffLink = Linker::linkKnown( + $newMessagesDiffLink = $linkRenderer->makeKnownLink( $uTalkTitle, - $this->msg( 'newmessagesdifflinkplural' )->params( $plural )->escaped(), + $this->msg( 'newmessagesdifflinkplural' )->params( $plural )->text(), [], $lastSeenRev !== null ? [ 'oldid' => $lastSeenRev->getId(), 'diff' => 'cur' ] @@ -1634,11 +1645,12 @@ abstract class Skin extends ContextSource { $result = '['; + $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer(); $linksHtml = []; foreach ( $links as $k => $linkDetails ) { - $linksHtml[] = Linker::linkKnown( + $linksHtml[] = $linkRenderer->makeKnownLink( $linkDetails['targetTitle'], - htmlspecialchars( $linkDetails['text'] ), + $linkDetails['text'], $linkDetails['attribs'], $linkDetails['query'] );