Merge "Don't pass a MailAddress pass the email to mail()" into REL1_31

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index e8c384a..2245aba 100644 (file)
--- 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 bdd4f44..fcb6173 100644 (file)
--- 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,