From dfb50ab9f3e119f4bd3425863068406c111a988d Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Thu, 8 Dec 2016 14:13:59 -0800 Subject: [PATCH] Set $wgUserEmailUseReplyTo = true by default Mainly to work around restrictive DMARC policies (e.g., Yahoo!). Bug: T66795 Change-Id: I3b34f6820915cc68d46ff6fd38feacd06efd2b69 --- RELEASE-NOTES-1.29 | 1 + includes/DefaultSettings.php | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29 index e5d28c66bc..5ff4ca9a15 100644 --- a/RELEASE-NOTES-1.29 +++ b/RELEASE-NOTES-1.29 @@ -22,6 +22,7 @@ production. code for ApiBase::parseMsg() will no longer work. * ApiBase::$messageMap is no longer public. Code attempting to access it will result in a PHP fatal error. +* $wgUserEmailUseReplyTo is now false by default to work around restrictive DMARC policies. === New features in 1.29 === * (T5233) A cookie can now be set when a user is autoblocked, to track that user if diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 6514c125d9..e908a16e69 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1585,14 +1585,15 @@ $wgEnableEmail = true; $wgEnableUserEmail = true; /** - * Set to true to put the sending user's email in a Reply-To header - * instead of From. ($wgPasswordSender will be used as From.) + * If true put the sending user's email in a Reply-To header + * instead of From (false). ($wgPasswordSender will be used as From.) * * Some mailers (eg SMTP) set the SMTP envelope sender to the From value, * which can cause problems with SPF validation and leak recipient addresses - * when bounces are sent to the sender. + * when bounces are sent to the sender. In addition, DMARC restrictions + * can cause emails to fail to be received when false. */ -$wgUserEmailUseReplyTo = false; +$wgUserEmailUseReplyTo = true; /** * Minimum time, in hours, which must elapse between password reminder -- 2.20.1