Followup r93417; Don't use $wgServer in a way that makes invalid Message-IDs. Instead...

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 11040b1..beac67f 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -127,10 +127,16 @@ class UserMailer {
         * @return String
         */
        static function makeMsgId() {
-               global $wgServer;
+               global $wgSMTP, $wgServer;
 
-               $msgid = uniqid( "UserMailer", true ); /* true required for cygwin */
-               return "<$msgid@$wgServer>";
+               $msgid = uniqid( wfWikiID() . ".", true ); /* true required for cygwin */
+               if ( is_array($wgSMTP) && $isset($wgSMTP['IDHost']) && $wgSMTP['IDHost'] ) {
+                       $domain = $wgSMTP['IDHost'];
+               } else {
+                       $url = wfParseUrl($wgServer);
+                       $domain = $url['host'];
+               }
+               return "<$msgid@$domain>";
        }
 
        /**