jenkins-bot has submitted this change and it was merged.
Change subject: Deprecated use of 5th parameter in UserMailer::send
......................................................................
Deprecated use of 5th parameter in UserMailer::send
*In EmailBatch.php line 287
Bug: T123641
Change-Id: I7f75448b0f6839c6d104eedca0f0c2f7d0780337
---
M includes/EmailBatch.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Reedy: Looks good to me, approved
Catrope: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/EmailBatch.php b/includes/EmailBatch.php
index a2b184c..8dd895a 100644
--- a/includes/EmailBatch.php
+++ b/includes/EmailBatch.php
@@ -281,10 +281,10 @@
$toAddress = MailAddress::newFromUser( $this->mUser );
$fromAddress = new MailAddress( $wgNotificationSender,
EchoHooks::getNotificationSenderName() );
- $replyAddress = new MailAddress( $wgNotificationSender,
$wgNotificationReplyName );
+ $replyTo = new MailAddress( $wgNotificationSender,
$wgNotificationReplyName );
// @Todo Push the email to job queue or just send it out
directly?
- UserMailer::send( $toAddress, $fromAddress, $subject, $body,
$replyAddress );
+ UserMailer::send( $toAddress, $fromAddress, $subject, $body,
array( 'replyTo' => $replyTo ) );
MWEchoEventLogging::logSchemaEchoMail( $this->mUser,
$emailDeliveryMode );
}
--
To view, visit https://gerrit.wikimedia.org/r/264588
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f75448b0f6839c6d104eedca0f0c2f7d0780337
Gerrit-PatchSet: 10
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: MtDu <[email protected]>
Gerrit-Reviewer: Aklapper <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: MtDu <[email protected]>
Gerrit-Reviewer: PranavK <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
