jenkins-bot has submitted this change and it was merged.
Change subject: Disable language conversion for echoed sortkeys in defaultsort
errors.
......................................................................
Disable language conversion for echoed sortkeys in defaultsort errors.
Change-Id: I24ac06687df126b59a3eddeb4ed00b2ca0ee22e9
---
M includes/parser/CoreParserFunctions.php
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Parent5446: Looks good to me, but someone else must approve
Matmarex: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/parser/CoreParserFunctions.php
b/includes/parser/CoreParserFunctions.php
index 2b84358..8246f71 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -862,10 +862,12 @@
if ( $old === false || $old == $text || $arg ) {
return '';
} else {
+ $converter =
$parser->getConverterLanguage()->getConverter();
return '<span class="error">' .
wfMessage( 'duplicate-defaultsort',
- wfEscapeWikiText( $old ), // Message
should be parsed, but these params should only be escaped.
- wfEscapeWikiText( $text )
+ // Message should be parsed, but these
params should only be escaped.
+ $converter->markNoConversion(
wfEscapeWikiText( $old ) ),
+ $converter->markNoConversion(
wfEscapeWikiText( $text ) )
)->inContentLanguage()->text() .
'</span>';
}
--
To view, visit https://gerrit.wikimedia.org/r/72003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I24ac06687df126b59a3eddeb4ed00b2ca0ee22e9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Liangent <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Brian Wolff <[email protected]>
Gerrit-Reviewer: Daniel Friesen <[email protected]>
Gerrit-Reviewer: Matmarex <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
