From 6bc0e36d8b33b6d0602b912fba75938368e09406 Mon Sep 17 00:00:00 2001 From: Reedy Date: Sat, 20 Oct 2018 13:37:15 +0100 Subject: [PATCH 1/1] Don't pass a MailAddress pass the email to mail() Bug: T207541 Change-Id: I1516023907e9773cb093010c6b67279f695abb1a (cherry picked from commit c57aacb782f5ce5e53253192a53d736ece300d3c) --- RELEASE-NOTES-1.31 | 1 + includes/mail/UserMailer.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31 index e8c384abca..2245aba9e8 100644 --- a/RELEASE-NOTES-1.31 +++ b/RELEASE-NOTES-1.31 @@ -15,6 +15,7 @@ THIS IS NOT A RELEASE YET not be set. * Fix PHP 7.3 warnings "preg_replace(): [...] invalid range in character class" * (T207540) Include IP address in "Login for $1 succeeded" log entry. +* (T207541) Pass email address to mail(). == MediaWiki 1.31.1 == diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php index bdd4f44874..fcb617319d 100644 --- a/includes/mail/UserMailer.php +++ b/includes/mail/UserMailer.php @@ -431,7 +431,7 @@ class UserMailer { try { foreach ( $to as $recip ) { $sent = mail( - $recip, + $recip->toString(), self::quotedPrintable( $subject ), $body, $headers, -- 2.20.1