jenkins-bot has submitted this change and it was merged.
Change subject: Replace instance of wfMsg functions wfMessage
......................................................................
Replace instance of wfMsg functions wfMessage
Bug: T70750
Change-Id: Ie916877f2dd7669a871cd8e61f92a40b7512f787
---
M Transliterator_body.php
1 file changed, 7 insertions(+), 7 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Transliterator_body.php b/Transliterator_body.php
index f3fcca6..e1898f4 100644
--- a/Transliterator_body.php
+++ b/Transliterator_body.php
@@ -179,10 +179,10 @@
$map = $wgMemc->get( wfMemcKey( self::CACHE_PREFIX,
$mappage ) );
if ( !$map ) {
- $maptext = wfMsg( $mappage );
+ $mapMessage = wfMessage( $mappage );
- if ( !wfEmptyMsg( $mappage, $maptext ) ) {
- $map = self::readMap( $maptext,
$mappage );
+ if ( !$mapMessage->isDisabled() ) {
+ $map = self::readMap(
$mapMessage->text(), $mappage );
}
if ( $map ) {
@@ -357,7 +357,7 @@
// Check for DoS
if ( count( $lines ) > $wgTransliteratorRuleCount ) {
- return wfMsgExt( 'transliterator-error-rulecount',
array( 'parsemag' ), $wgTransliteratorRuleCount, $mappage );
+ return wfMessage( 'transliterator-error-rulecount',
$wgTransliteratorRuleCount, $mappage )->escaped();
}
foreach ( $lines as $line ) {
@@ -365,16 +365,16 @@
$pair = preg_split( '/\s*=>\s*/u', $line );
if ( count( $pair ) != 2 || $pair[0] === '' ) {
- return wfMsg( 'transliterator-error-syntax',
$line, $mappage );
+ return wfMessage(
'transliterator-error-syntax', $line, $mappage )->escaped();
}
if ( strlen( $pair[0] ) > $wgTransliteratorRuleSize ) {
- return wfMsg( 'transliterator-error-rulesize',
$line, $mappage, $wgTransliteratorRuleSize );
+ return wfMessage(
'transliterator-error-rulesize', $line, $mappage, $wgTransliteratorRuleSize
)->escaped();
}
if ( !self::addToRules( $pair[0], $pair[1], $flags,
$rules, $attrs ) ) {
- return wfMsg( 'transliterator-error-ambiguous',
$line, $mappage );
+ return wfMessage(
'transliterator-error-ambiguous', $line, $mappage )->escaped();
}
}
--
To view, visit https://gerrit.wikimedia.org/r/182577
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie916877f2dd7669a871cd8e61f92a40b7512f787
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Transliterator
Gerrit-Branch: master
Gerrit-Owner: McIntireEvan <[email protected]>
Gerrit-Reviewer: Conrad.Irwin <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: McIntireEvan <[email protected]>
Gerrit-Reviewer: Nemo bis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
