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

diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php
index 5d7afd31db..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 {
@@ -430,7 +431,7 @@ class UserMailer {
 			try {
 				foreach ( $to as $recip ) {
 					$sent = mail(
-						$recip,
+						$recip->toString(),
 						self::quotedPrintable( $subject ),
 						$body,
 						$headers,