Skip to content

Commit c3f011e

Browse files
authored
Fix 1.44 compatibility; replace deprecated methods (#37)
1 parent 149946b commit c3f011e

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

includes/MonacoSidebar.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<?php
22

33
use MediaWiki\HookContainer\HookContainer;
4+
use MediaWiki\Html\Html;
45
use MediaWiki\MediaWikiServices;
6+
use MediaWiki\Title\Title;
7+
use MediaWiki\Utils\UrlUtils;
58

69
class MonacoSidebar {
710
/** @var array */
@@ -69,7 +72,8 @@ public static function parseItem( $line ) {
6972
if ( !wfMessage( $line_temp[0] )->exists() ) {
7073
$link = $line_temp[0];
7174
}
72-
if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', $link ) ) {
75+
$urlUtils = MediaWikiServices::getInstance()->getUrlUtils();
76+
if ( preg_match( '/^(?:' . $urlUtils->validProtocols() . ')/', $link ) ) {
7377
$href = $link;
7478
} else {
7579
$title = Title::newFromText( $link );
@@ -480,7 +484,8 @@ public function parseSidebarLine( $line ) {
480484
$link = $lineTmp[0];
481485
}
482486

483-
if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', $link ) ) {
487+
$urlUtils = MediaWikiServices::getInstance()->getUrlUtils();
488+
if ( preg_match( '/^(?:' . $urlUtils->validProtocols() . ')/', $link ) ) {
484489
$href = $link;
485490
} else {
486491
if ( empty( $link ) ) {

includes/MonacoTemplate.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
<?php
22

33
use MediaWiki\Config\GlobalVarConfig;
4+
use MediaWiki\Html\Html;
5+
use MediaWiki\Linker\Linker;
46
use MediaWiki\MediaWikiServices;
57
use MediaWiki\HookContainer\HookContainer;
8+
use MediaWiki\Skin\SkinComponentUtils;
9+
use MediaWiki\Title\Title;
610

711
class MonacoTemplate extends BaseTemplate {
812

@@ -280,8 +284,8 @@ public function execute() {
280284
}
281285

282286
$feRandIcon = $this->blankimg( [ 'id' => 'fe_random_img', 'class' => 'sprite random', 'alt' => '' ] );
283-
$feRandIcon = Html::rawElement( 'a', [ 'id' => 'fe_random_icon', 'href' => Skin::makeSpecialUrl( 'Randompage' ) ], $feRandIcon );
284-
$feRandLink = Html::rawElement( 'a', [ 'id' => 'fe_random_link', 'href' => Skin::makeSpecialUrl( 'Randompage' ) ], wfMessage( 'viewrandompage' )->escaped() );
287+
$feRandIcon = Html::rawElement( 'a', [ 'id' => 'fe_random_icon', 'href' => SkinComponentUtils::makeSpecialUrl( 'Randompage' ) ], $feRandIcon );
288+
$feRandLink = Html::rawElement( 'a', [ 'id' => 'fe_random_link', 'href' => SkinComponentUtils::makeSpecialUrl( 'Randompage' ) ], wfMessage( 'viewrandompage' )->escaped() );
285289

286290
$html .= '<ul class="actions clearfix" id="articleFooterActions2">';
287291
$html .= Html::rawElement( 'li', [ 'id' => 'fe_randompage' ],
@@ -785,7 +789,7 @@ private function getUserLinks() {
785789
$returnto = wfArrayToCGI( $a );
786790

787791
if ( !$user->isRegistered() ) {
788-
$signUpHref = Skin::makeSpecialUrl( 'Userlogin', $returnto );
792+
$signUpHref = SkinComponentUtils::makeSpecialUrl( 'Userlogin', $returnto );
789793
$data['login'] = [
790794
'text' => wfMessage( 'login' )->text(),
791795
'href' => $signUpHref . '&type=login'

includes/SkinMonaco.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
use MediaWiki\MediaWikiServices;
44
use MediaWiki\Revision\SlotRecord;
5+
use MediaWiki\Title\Title;
56
use MediaWiki\User\UserOptionsLookup;
67

78
class SkinMonaco extends SkinTemplate {

0 commit comments

Comments
 (0)