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

Merge "Use MailAddress::newFromUser()"

Browse source
This commit is contained in:
jenkins-bot 2014-10-20 17:25:11 +00:00 committed by Gerrit Code Review
parent 3d91ac75a4 d196cbf94e
commit d495389a1c
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Notifier.php
View file

@ -86,7 +86,7 @@ class EchoNotifier {
// 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

2
includes/EmailBatch.php
View file

@ -217,7 +217,7 @@ abstract class MWEchoEmailBatch {
->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 );

2
includes/EmailBundler.php
View file

@ -243,7 +243,7 @@ abstract class MWEchoEmailBundler {
global $wgNotificationSender, $wgNotificationReplyName;
$toAddress = new MailAddress( $this->mUser );
$toAddress = MailAddress::newFromUser( $this->mUser );
$fromAddress = new MailAddress( $wgNotificationSender, EchoHooks::getNotificationSenderName() );
$replyAddress = new MailAddress( $wgNotificationSender, $wgNotificationReplyName );