jenkins-bot has submitted this change and it was merged.
Change subject: Replace instance of wfMsg* functions with non-deprecated
counterparts
......................................................................
Replace instance of wfMsg* functions with non-deprecated counterparts
Bug: T70750
Change-Id: I415dd2a1511265e2761dcd1fe27800afc95b13d6
---
M SpecialThemeDesigner.php
M frame/layout.php
2 files changed, 11 insertions(+), 12 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialThemeDesigner.php b/SpecialThemeDesigner.php
index efeb95a..61c823e 100644
--- a/SpecialThemeDesigner.php
+++ b/SpecialThemeDesigner.php
@@ -58,7 +58,7 @@
// While 1.16 is still stable.
$varScript = array();
foreach ( array('leavewarning', 'resizertext') as $msgName ) {
- $varScript[] = 'msg'.ucfirst($msgName).' =
'.Xml::encodeJsVar((string)wfMsg("themedesigner-{$msgName}"));
+ $varScript[] = 'msg'.ucfirst($msgName).' =
'.Xml::encodeJsVar($this->msg("themedesigner-{$msgName}")->text());
}
$varScript = 'var '.implode(", ", $varScript).';';
$wgOut->addInlineScript($varScript);
diff --git a/frame/layout.php b/frame/layout.php
index f7d9c39..eee9b59 100644
--- a/frame/layout.php
+++ b/frame/layout.php
@@ -1,21 +1,20 @@
<nav id="designer-nav">
<ul>
- <li><span><?php echo htmlspecialchars(wfMsg('themedesigner'));
?></span></li>
- <li><a href="<?php echo htmlspecialchars(
Title::newMainPage()->getLocalURL() ); ?>"><?php echo
htmlspecialchars(wfMsg('mainpage-description')); ?></a></li>
- <li><a href="<?php echo htmlspecialchars(
SpecialPage::getTitleFor('Recentchanges')->getLocalURL() ); ?>"><?php echo
htmlspecialchars(wfMsg('recentchanges')); ?></a></li>
- <li><a href="<?php echo htmlspecialchars(
SpecialPage::getTitleFor('Specialpages')->getLocalURL() ); ?>"><?php echo
htmlspecialchars(wfMsg('specialpages')); ?></a></li>
+ <li><span><?php echo $this->msg('themedesigner')->escaped();
?></span></li>
+ <li><a href="<?php echo htmlspecialchars(
Title::newMainPage()->getLocalURL() ); ?>"><?php echo
$this->msg('mainpage-description')->escaped(); ?></a></li>
+ <li><a href="<?php echo htmlspecialchars(
SpecialPage::getTitleFor('Recentchanges')->getLocalURL() ); ?>"><?php echo
$this->msg('recentchanges')->escaped(); ?></a></li>
+ <li><a href="<?php echo htmlspecialchars(
SpecialPage::getTitleFor('Specialpages')->getLocalURL() ); ?>"><?php echo
$this->msg('specialpages')->escaped(); ?></a></li>
</ul>
</nav>
<div id=designer-interface>
<div id=designer-interface-bar class=secondary-bar>
- <?php echo
htmlspecialchars(wfMsg('themedesigner-interface-skinlabel')) ?>
+ <?php echo
$this->msg('themedesigner-interface-skinlabel')->escaped() ?>
<?php
$validSkinNames = Skin::getUsableSkins();
foreach ( $validSkinNames as $skinkey => &$skinname ) {
- $msgName = "skinname-{$skinkey}";
- $localisedSkinName = wfMsg( $msgName );
- if ( !wfEmptyMsg( $msgName, $localisedSkinName ) ) {
- $skinname = htmlspecialchars(
$localisedSkinName );
+ $skinMessage = $this->msg( "skinname-{$skinkey}" );
+ if ( !$skinMessage->isDisabled() ) {
+ $skinname = $skinMessage->escaped();
}
}
asort( $validSkinNames );
@@ -37,9 +36,9 @@
</section>
</div>
<div id=designer-viewer>
- <noscript><?php echo wfMsgWikiHtml('themedesigner-noscript');
?></noscript>
+ <noscript><?php echo $this->msg('themedesigner-noscript')->parse();
?></noscript>
<div id=designer-viewer-bar class=secondary-bar>
</div>
- <div id=designer-wrongskinmessage><?php echo
wfMsgWikiHtml('themedesigner-wrongskin'); ?></div>
+ <div id=designer-wrongskinmessage><?php echo
$this->msg('themedesigner-wrongskin')->parse(); ?></div>
<div id=designer-viewer-framewrapper></div>
</div>
--
To view, visit https://gerrit.wikimedia.org/r/182578
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I415dd2a1511265e2761dcd1fe27800afc95b13d6
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/ThemeDesigner
Gerrit-Branch: master
Gerrit-Owner: McIntireEvan <[email protected]>
Gerrit-Reviewer: Daniel Friesen <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: McIntireEvan <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Waldir <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
