Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226897
Change subject: Escape return of {{int:}} if message not exists
......................................................................
Escape return of {{int:}} if message not exists
This avoids returning possible html tags like <var> for {{int:var}}.
Bug: T44914
Change-Id: Ibcba9129d88510e6a84282c774ebe2dbfa548462
---
M includes/parser/CoreParserFunctions.php
M tests/parser/parserTests.txt
2 files changed, 16 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/97/226897/1
diff --git a/includes/parser/CoreParserFunctions.php
b/includes/parser/CoreParserFunctions.php
index 8a30ad1..7639e2f 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -88,9 +88,13 @@
if ( strval( $part1 ) !== '' ) {
$args = array_slice( func_get_args(), 2 );
$message = wfMessage( $part1, $args )
- ->inLanguage(
$parser->getOptions()->getUserLangObj() )->plain();
-
- return array( $message, 'noparse' => false );
+ ->inLanguage(
$parser->getOptions()->getUserLangObj() );
+ if ( !$message->exists() ) {
+ // When message does not exists, the message
name is surrounded by angle
+ // and can result in a tag, therefore escape
the angles
+ return $message->escaped();
+ }
+ return array( $message->plain(), 'noparse' => false );
} else {
return array( 'found' => false );
}
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index ab33d89..5fcc7bb 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -10236,6 +10236,15 @@
</p>
!! end
+!! test
+int keyword - non-existing message
+!! wikitext
+{{int:var}}
+!! html
+<p><var>
+</p>
+!! end
+
!! article
Template:Includes
!! text
--
To view, visit https://gerrit.wikimedia.org/r/226897
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcba9129d88510e6a84282c774ebe2dbfa548462
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
