* @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>";
}
/**