Merge "Improve docs for Title::getInternalURL/getCanonicalURL"

[lhc/web/wiklou.git] / includes / mail / UserMailer.php

diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php
index 102d615..5d7030b 100644 (file)
--- 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::getCurrentWikiDbDomain()->getId();
+               $msgid = uniqid( $domainId . ".", true /** for cygwin */ );
                if ( is_array( $wgSMTP ) && isset( $wgSMTP['IDHost'] ) && $wgSMTP['IDHost'] ) {
                        $domain = $wgSMTP['IDHost'];
                } else {
@@ -101,7 +102,7 @@ class UserMailer {
         * @param MailAddress|MailAddress[] $to Recipient's email (or an array of them)
         * @param MailAddress $from Sender's email
         * @param string $subject Email's subject.
-        * @param string $body Email's text or Array of two strings to be the text and html bodies
+        * @param string|string[] $body Email's text or Array of two strings to be the text and html bodies
         * @param array $options Keys:
         *     'replyTo' MailAddress
         *     'contentType' string default 'text/plain; charset=UTF-8'
@@ -224,7 +225,7 @@ class UserMailer {
         * @param MailAddress[] $to Array of recipients' email addresses
         * @param MailAddress $from Sender's email
         * @param string $subject Email's subject.
-        * @param string $body Email's text or Array of two strings to be the text and html bodies
+        * @param string|string[] $body Email's text or Array of two strings to be the text and html bodies
         * @param array $options Keys:
         *     'replyTo' MailAddress
         *     'contentType' string default 'text/plain; charset=UTF-8'