jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/325816 )
Change subject: Fixed publishers field double escaping HTML
......................................................................
Fixed publishers field double escaping HTML
'label' in HTMLForm does not accept raw HTML. This resulted in a  
being shown when using French.
Bug: T140575
Change-Id: I213990c6e9dd8c30f2218af1bbd4197ad4179965
---
M includes/content/NewsletterContent.php
M includes/specials/SpecialNewsletter.php
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/content/NewsletterContent.php
b/includes/content/NewsletterContent.php
index 0e0bc55..d711beb 100644
--- a/includes/content/NewsletterContent.php
+++ b/includes/content/NewsletterContent.php
@@ -160,7 +160,7 @@
'label' => wfMessage(
'newsletter-view-publishers' )->inLanguage(
$options->getUserLangObj() )
->numParams( count(
$this->publishers ) )
- ->parse(),
+ ->text(),
),
'subscribers' => array(
'type' => 'info',
@@ -200,7 +200,7 @@
'default' => $logs,
'label' => wfMessage(
'newsletter-view-issues-log' )
->inLanguage(
$options->getUserLangObj() )
- ->numParams( $logCount
)->escaped(),
+ ->numParams( $logCount
)->text(),
);
}
$form = $this->getHTMLForm(
diff --git a/includes/specials/SpecialNewsletter.php
b/includes/specials/SpecialNewsletter.php
index f60a383..63f8182 100644
--- a/includes/specials/SpecialNewsletter.php
+++ b/includes/specials/SpecialNewsletter.php
@@ -225,7 +225,7 @@
'type' => 'info',
'label' => $this->msg(
'newsletter-view-publishers' )
->numParams( count( $publishers ) )
- ->parse(),
+ ->text(),
),
'subscribe' => array(
'type' => 'info',
@@ -264,7 +264,7 @@
'type' => 'info',
'raw' => true,
'default' => $logs,
- 'label' => $this->msg(
'newsletter-view-issues-log' )->numParams( $logCount )->escaped(),
+ 'label' => $this->msg(
'newsletter-view-issues-log' )->numParams( $logCount )->text(),
);
}
--
To view, visit https://gerrit.wikimedia.org/r/325816
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I213990c6e9dd8c30f2218af1bbd4197ad4179965
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Georggi199 <bmp2...@gmail.com>
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Aklapper <aklap...@wikimedia.org>
Gerrit-Reviewer: Georggi199 <bmp2...@gmail.com>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
