wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-23 23:44:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Escape messages used in HTMLSelectField 'options'"

Browse source
This commit is contained in:
jenkins-bot 2018-08-29 10:52:44 +00:00 committed by Gerrit Code Review
parent 918a19efac 5daca5ee1a
commit a5d17463d4
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
includes/EchoHooks.php
View file

@ -291,16 +291,16 @@ class EchoHooks {
$attributeManager = EchoAttributeManager::newFromGlobalVars();
// Show email frequency options
$never = wfMessage( 'echo-pref-email-frequency-never' )->plain();
$immediately = wfMessage( 'echo-pref-email-frequency-immediately' )->plain();
$never = wfMessage( 'echo-pref-email-frequency-never' )->escaped();
$immediately = wfMessage( 'echo-pref-email-frequency-immediately' )->escaped();
$freqOptions = [
$never => EchoEmailFrequency::NEVER,
$immediately => EchoEmailFrequency::IMMEDIATELY,
];
// Only show digest options if email batch is enabled
if ( $wgEchoEnableEmailBatch ) {
$daily = wfMessage( 'echo-pref-email-frequency-daily' )->plain();
$weekly = wfMessage( 'echo-pref-email-frequency-weekly' )->plain();
$daily = wfMessage( 'echo-pref-email-frequency-daily' )->escaped();
$weekly = wfMessage( 'echo-pref-email-frequency-weekly' )->escaped();
$freqOptions += [
$daily => EchoEmailFrequency::DAILY_DIGEST,
$weekly => EchoEmailFrequency::WEEKLY_DIGEST,
@ -347,8 +347,8 @@ class EchoHooks {
'label-message' => 'echo-pref-email-format',
'section' => 'echo/emailsettings',
'options' => [
wfMessage( 'echo-pref-email-format-html' )->plain() => EchoEmailFormat::HTML,
wfMessage( 'echo-pref-email-format-plain-text' )->plain() => EchoEmailFormat::PLAIN_TEXT,
wfMessage( 'echo-pref-email-format-html' )->escaped() => EchoEmailFormat::HTML,
wfMessage( 'echo-pref-email-format-plain-text' )->escaped() => EchoEmailFormat::PLAIN_TEXT,
]
];
}