X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fmail%2FUserMailer.php;h=f348c5bb4e93e6905968ba9fd24a11aa3cca14df;hb=ee975d6d1a376bb08d2b1731f97abc96f6e26b1d;hp=bdd4f448748f43fae79fa4e0643bbb7f5bdb2bbf;hpb=967a96e7fa5910f8fc451590decb381dbfb481ba;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php
index bdd4f44874..f348c5bb4e 100644
--- a/includes/mail/UserMailer.php
+++ b/includes/mail/UserMailer.php
@@ -82,7 +82,8 @@ class UserMailer {
 	static function makeMsgId() {
 		global $wgSMTP, $wgServer;
 
-		$msgid = uniqid( wfWikiID() . ".", true ); /* true required for cygwin */
+		$domainId = WikiMap::getCurrentWikiDomain()->getId();
+		$msgid = uniqid( $domainId . ".", true /** for cygwin */ );
 		if ( is_array( $wgSMTP ) && isset( $wgSMTP['IDHost'] ) && $wgSMTP['IDHost'] ) {
 			$domain = $wgSMTP['IDHost'];
 		} else {
@@ -244,10 +245,9 @@ class UserMailer {
 		global $wgSMTP, $wgEnotifMaxRecips, $wgAdditionalMailParams;
 		$mime = null;
 
-		$replyto = isset( $options['replyTo'] ) ? $options['replyTo'] : null;
-		$contentType = isset( $options['contentType'] ) ?
-			$options['contentType'] : 'text/plain; charset=UTF-8';
-		$headers = isset( $options['headers'] ) ? $options['headers'] : [];
+		$replyto = $options['replyTo'] ?? null;
+		$contentType = $options['contentType'] ?? 'text/plain; charset=UTF-8';
+		$headers = $options['headers'] ?? [];
 
 		// Allow transformation of content, such as encrypting/signing
 		$error = false;
@@ -431,7 +431,7 @@ class UserMailer {
 			try {
 				foreach ( $to as $recip ) {
 					$sent = mail(
-						$recip,
+						$recip->toString(),
 						self::quotedPrintable( $subject ),
 						$body,
 						$headers,