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

Merge "Fix HTML escaping on Special:DisplayNotificationsConfiguration"

Browse source
This commit is contained in:
jenkins-bot 2018-09-05 12:56:57 +00:00 committed by Gerrit Code Review
parent b6f4e9d133 4b8916c405
commit 9eebe652a7
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
includes/special/SpecialDisplayNotificationsConfiguration.php
View file

@ -25,14 +25,14 @@ class SpecialDisplayNotificationsConfiguration extends UnlistedSpecialPage {
// Should be one mapping text (friendly) name to internal name, but there
// is no friendly name
/**
* Notification type names. Mapping internal name to internal name
* Notification type names. Mapping HTML-formatted internal name to internal name
*
* @var string[] $notificationTypeNames
*/
protected $notificationTypeNames;
/**
* Notify types, mapping internal name to text name
* Notify types, mapping internal name to HTML-formatted name
*
* @var string[] $notifyTypes
*/
@ -47,7 +47,7 @@ class SpecialDisplayNotificationsConfiguration extends UnlistedSpecialPage {
protected $flippedCategoryNames;
/**
* Notify types, mapping text name to internal name
* Notify types, mapping HTML-formatted name to internal name
*
* @var string[] $flippedNotifyTypes
*/
@ -91,13 +91,16 @@ class SpecialDisplayNotificationsConfiguration extends UnlistedSpecialPage {
$this->notifyTypes = [];
foreach ( $wgEchoNotifiers as $notifyType => $notifier ) {
$this->notifyTypes[$notifyType] = $this->msg( 'echo-pref-' . $notifyType )->text();
$this->notifyTypes[$notifyType] = $this->msg( 'echo-pref-' . $notifyType )->escaped();
}
$this->flippedNotifyTypes = array_flip( $this->notifyTypes );
$notificationTypes = array_keys( $wgEchoNotifications );
$this->notificationTypeNames = array_combine( $notificationTypes, $notificationTypes );
$this->notificationTypeNames = array_combine(
array_map( 'htmlspecialchars', $notificationTypes ),
$notificationTypes
);
$this->getOutput()->setPageTitle( $this->msg( 'echo-displaynotificationsconfiguration' )->text() );
$this->outputHeader( 'echo-displaynotificationsconfiguration-summary' );
@ -196,7 +199,7 @@ class SpecialDisplayNotificationsConfiguration extends UnlistedSpecialPage {
$types = $this->attributeManager->getEventsForSection( $section );
// echo-notification-alert-text-only, echo-notification-notice-text-only
$msgSection = $section == 'message' ? 'notice' : $section;
$flippedSectionNames[$this->msg( 'echo-notification-' . $msgSection . '-text-only' )->text()] = $section;
$flippedSectionNames[$this->msg( 'echo-notification-' . $msgSection . '-text-only' )->escaped()] = $section;
foreach ( $types as $type ) {
$bySectionValue[] = "$section-$type";
}