Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace deprecated url functions in Skin class

Browse source 
Change-Id: I9a55545e4c09a777ccf2f09b9d4374c3414cadca
This commit is contained in:
WMDE-Fisch 2024-05-04 14:25:18 +03:00
parent ea2874971b
commit b90e0e4261
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
includes/skins/Skin.php
View file

@ -851,7 +851,8 @@ abstract class Skin extends ContextSource {
* @return string HTML text with an URL
*/
public function printSource() {
$url = htmlspecialchars( wfExpandIRI( $this->getCanonicalUrl() ) );
$urlUtils = MediaWikiServices::getInstance()->getUrlUtils();
$url = htmlspecialchars( $urlUtils->expandIRI( $this->getCanonicalUrl() ) ?? '' );
return $this->msg( 'retrievedfrom' )
->rawParams( '<a dir="ltr" href="' . $url . '">' . $url . '</a>' )
@ -1132,7 +1133,9 @@ abstract class Skin extends ContextSource {
* @return string URL
*/
public static function makeInternalOrExternalUrl( $name ) {
if ( preg_match( '/^(?i:' . wfUrlProtocols() . ')/', $name ) ) {
$protocols = MediaWikiServices::getInstance()->getUrlUtils()->validAbsoluteProtocols();
if ( preg_match( '/^(?i:' . $protocols . ')/', $name ) ) {
return $name;
} else {
$title = $name instanceof Title ? $name : Title::newFromText( $name );
@ -1562,7 +1565,9 @@ abstract class Skin extends ContextSource {
$config = $this->getConfig();
$messageTitle = $config->get( MainConfigNames::EnableSidebarCache )
? Title::newMainPage() : $this->getTitle();
$messageCache = MediaWikiServices::getInstance()->getMessageCache();
$services = MediaWikiServices::getInstance();
$messageCache = $services->getMessageCache();
$urlUtils = $services->getUrlUtils();
foreach ( $lines as $line ) {
if ( strpos( $line, '*' ) !== 0 ) {
@ -1605,13 +1610,15 @@ abstract class Skin extends ContextSource {
$text = $line[1];
}
if ( preg_match( '/^(?i:' . wfUrlProtocols() . ')/', $link ) ) {
if ( preg_match( '/^(?i:' . $urlUtils->validAbsoluteProtocols() . ')/', $link ) ) {
$href = $link;
// Parser::getExternalLinkAttribs won't work here because of the Namespace things
if ( $config->get( MainConfigNames::NoFollowLinks ) &&
!wfMatchesDomainList( $href,
$config->get( MainConfigNames::NoFollowDomainExceptions ) )
!$urlUtils->matchesDomainList(
(string)$href,
(array)$config->get( MainConfigNames::NoFollowDomainExceptions )
)
) {
$extraAttribs['rel'] = 'nofollow';
}