jenkins-bot has submitted this change and it was merged.
Change subject: Cleanup old Echo formatter
......................................................................
Cleanup old Echo formatter
This extension was migrated to use the new
Echo presentation model to render notifications.
This commit removes all traces of the old
formatter system.
Bug: T151413
Change-Id: I10696ec4b7f1b32ea70f33ec022ebc43803fd01a
---
M Newsletter.hooks.php
M extension.json
D includes/Echo/EchoNewsletterFormatter.php
3 files changed, 0 insertions(+), 52 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Newsletter.hooks.php b/Newsletter.hooks.php
index 8b699ed..a253789 100755
--- a/Newsletter.hooks.php
+++ b/Newsletter.hooks.php
@@ -33,7 +33,6 @@
'EchoNewsletterUserLocator::locateNewsletterSubscribedUsers',
),
'presentation-model' =>
'EchoNewsletterPresentationModel',
- 'formatter-class' => 'EchoNewsletterFormatter',
'title-message' => 'newsletter-notification-title',
'title-params' => array( 'newsletter-name', 'title',
'agent', 'user' ),
'flyout-message' => 'newsletter-notification-flyout',
@@ -55,7 +54,6 @@
array( 'EchoUserLocator::locateFromEventExtra',
array( 'new-publishers-id' ) )
),
'presentation-model' =>
'EchoNewsletterPublisherPresentationModel',
- 'formatter-class' => 'EchoNewsletterFormatter',
'title-message' =>
'newsletter-notification-new-publisher-title',
'title-params' => array( 'newsletter-name', 'agent' ),
'flyout-message' =>
'newsletter-notification-new-publisher-flyout',
diff --git a/extension.json b/extension.json
index 5dcdb01..f8bc24c 100644
--- a/extension.json
+++ b/extension.json
@@ -87,7 +87,6 @@
"NewsletterDiffEngine":
"includes/content/NewsletterDiffEngine.php",
"NewsletterDeletionUpdate":
"includes/content/NewsletterDeletionUpdate.php",
"EchoNewsletterUserLocator":
"includes/Echo/EchoNewsletterUserLocator.php",
- "EchoNewsletterFormatter":
"includes/Echo/EchoNewsletterFormatter.php",
"BaseNewsletterPresentationModel":
"includes/Echo/BaseNewsletterPresentationModel.php",
"EchoNewsletterPresentationModel":
"includes/Echo/EchoNewsletterPresentationModel.php",
"EchoNewsletterPublisherPresentationModel":
"includes/Echo/EchoNewsletterPublisherPresentationModel.php"
diff --git a/includes/Echo/EchoNewsletterFormatter.php
b/includes/Echo/EchoNewsletterFormatter.php
deleted file mode 100644
index 77772d9..0000000
--- a/includes/Echo/EchoNewsletterFormatter.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * @license GNU GPL v2+
- * @author Tina Johnson
- */
-class EchoNewsletterFormatter extends EchoBasicFormatter {
-
- /**
- * @param EchoEvent $event
- * @param string $param
- * @param Message $message
- * @param User $user
- */
- protected function processParam( $event, $param, $message, $user ) {
- if ( $param === 'newsletter-name' ){
- $this->processParamEscaped( $message,
$event->getExtraParam( 'newsletter-name' ) );
- } else {
- parent::processParam( $event, $param, $message, $user );
- }
- }
-
- /**
- * Set target URL for primary link of notification
- *
- * @param EchoEvent $event
- * @param User $user The user receiving the notification
- * @param string $destination The destination type for the link
- *
- * @return array including target URL
- */
- protected function getLinkParams( $event, $user, $destination ) {
- $target = null;
- $query = array();
- switch ( $destination ) {
- case 'new-issue':
- // Placeholder for T119090 - currently the same
as 'title'
- $target = $event->getTitle();
- break;
- case 'newsletter':
- $target = SpecialPage::getTitleFor(
'Newsletter', $event->getExtraParam( 'newsletter-id' ) );
- break;
- default:
- throw new Exception( __METHOD__ . ':
$destination must be "new-issue" or "newsletter" (got: ' . $destination . ')' );
- }
-
- return array( $target, $query );
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/323153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I10696ec4b7f1b32ea70f33ec022ebc43803fd01a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Sbisson <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
