Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/161884
Change subject: Use MailAddress::newFromUser()
......................................................................
Use MailAddress::newFromUser()
Change-Id: I7c6ce9aade27dae66732274979d8baa9eeb0b17c
---
M Notifier.php
M includes/EmailBatch.php
M includes/EmailBundler.php
3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/84/161884/1
diff --git a/Notifier.php b/Notifier.php
index 702d923..53c6e74 100644
--- a/Notifier.php
+++ b/Notifier.php
@@ -86,7 +86,7 @@
// send single notification if the email wasn't added
to queue for bundling
if ( !$addedToQueue ) {
// instant email notification
- $toAddress = new MailAddress( $user );
+ $toAddress = MailAddress::newFromUser( $user );
$fromAddress = new MailAddress(
$wgNotificationSender, EchoHooks::getNotificationSenderName() );
$replyAddress = new MailAddress(
$wgNotificationSender, $wgNotificationReplyName );
// Since we are sending a single email, should
set the bundle hash to null
diff --git a/includes/EmailBatch.php b/includes/EmailBatch.php
index 6b5bbb1..854e0d3 100644
--- a/includes/EmailBatch.php
+++ b/includes/EmailBatch.php
@@ -217,7 +217,7 @@
->inLanguage( $this->mUser->getOption(
'language' ) )
->params( $count, $this->count )->text();
- $toAddress = new MailAddress( $this->mUser );
+ $toAddress = MailAddress::newFromUser( $this->mUser );
$fromAddress = new MailAddress( $wgNotificationSender,
EchoHooks::getNotificationSenderName() );
$replyAddress = new MailAddress( $wgNotificationSender,
$wgNotificationReplyName );
diff --git a/includes/EmailBundler.php b/includes/EmailBundler.php
index da9f034..ba01ad1 100644
--- a/includes/EmailBundler.php
+++ b/includes/EmailBundler.php
@@ -243,7 +243,7 @@
global $wgNotificationSender, $wgNotificationReplyName;
- $toAddress = new MailAddress( $this->mUser );
+ $toAddress = MailAddress::newFromUser( $this->mUser );
$fromAddress = new MailAddress( $wgNotificationSender,
EchoHooks::getNotificationSenderName() );
$replyAddress = new MailAddress( $wgNotificationSender,
$wgNotificationReplyName );
--
To view, visit https://gerrit.wikimedia.org/r/161884
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c6ce9aade27dae66732274979d8baa9eeb0b17c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
