dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Clarify userrights-conflict"
[lhc/web/wiklou.git]
/
includes
/
UserMailer.php
diff --git
a/includes/UserMailer.php
b/includes/UserMailer.php
index
8e3f048
..
0d77159
100644
(file)
--- a/
includes/UserMailer.php
+++ b/
includes/UserMailer.php
@@
-241,7
+241,7
@@
class UserMailer {
$headers['Reply-To'] = $replyto->toString();
}
$headers['Reply-To'] = $replyto->toString();
}
- $headers['Date'] =
date
( 'r' );
+ $headers['Date'] =
MWTimestamp::getLocalInstance()->format
( 'r' );
$headers['Message-ID'] = self::makeMsgId();
$headers['X-Mailer'] = 'MediaWiki mailer';
$headers['Message-ID'] = self::makeMsgId();
$headers['X-Mailer'] = 'MediaWiki mailer';
@@
-267,7
+267,7
@@
class UserMailer {
$body['text'] = str_replace( "\n", "\r\n", $body['text'] );
$body['html'] = str_replace( "\n", "\r\n", $body['html'] );
}
$body['text'] = str_replace( "\n", "\r\n", $body['text'] );
$body['html'] = str_replace( "\n", "\r\n", $body['html'] );
}
- $mime = new Mail_mime( array( 'eol' => $endl ) );
+ $mime = new Mail_mime( array( 'eol' => $endl
, 'text_charset' => 'UTF-8', 'html_charset' => 'UTF-8'
) );
$mime->setTXTBody( $body['text'] );
$mime->setHTMLBody( $body['html'] );
$body = $mime->get(); // must call get() before headers()
$mime->setTXTBody( $body['text'] );
$mime->setHTMLBody( $body['html'] );
$body = $mime->get(); // must call get() before headers()