BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/270553
Change subject: Use wiki email from user CC messages when
$wgUserEmailUseReplyTo is set
......................................................................
Use wiki email from user CC messages when $wgUserEmailUseReplyTo is set
Avoid bounces caused by SPF protections when sending CC messages to
users. This mirrors the logic used when sending the original message.
Change-Id: I1c48892e9b5086fd564eedd65cca6a848a2b425c
---
M includes/specials/SpecialEmailuser.php
1 file changed, 13 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/53/270553/1
diff --git a/includes/specials/SpecialEmailuser.php
b/includes/specials/SpecialEmailuser.php
index c036d3d..332588f 100644
--- a/includes/specials/SpecialEmailuser.php
+++ b/includes/specials/SpecialEmailuser.php
@@ -383,10 +383,22 @@
$cc_subject = $context->msg( 'emailccsubject'
)->rawParams(
$target->getName(), $subject )->text();
+ if ( $config->get( 'UserEmailUseReplyTo' ) ) {
+ $ccTo = new MailAddress( $config->get(
'PasswordSender' ),
+ wfMessage( 'emailsender'
)->inContentLanguage()->text() );
+ $replyTo = $from;
+ } else {
+ $ccTo = $from;
+ $replyTo = null;
+ }
+
// target and sender are equal, because this is
the CC for the sender
Hooks::run( 'EmailUserCC', array( &$from,
&$from, &$cc_subject, &$text ) );
- $ccStatus = UserMailer::send( $from, $from,
$cc_subject, $text );
+ $ccStatus = UserMailer::send(
+ $from, $ccTo, $cc_subject, $text, array(
+ 'replyTo' => $replyTo,
+ ) );
$status->merge( $ccStatus );
}
--
To view, visit https://gerrit.wikimedia.org/r/270553
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c48892e9b5086fd564eedd65cca6a848a2b425c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
