X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fmail%2FUserMailer.php;h=cdbe1c5793c38981c54a6e62edb15e232bf2cebc;hb=dcd0a3d53;hp=5d7afd31dbe9f2a9176789aafdfecbb1afaae588;hpb=a1bbdcb62913b22f28838e647a15fe5e070d6e92;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php
index 5d7afd31db..cdbe1c5793 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 {