Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265434
Change subject: Fixup contenttype stuff in UserMailer
......................................................................
Fixup contenttype stuff in UserMailer
Change-Id: I9e251962fe731fa78f6867a14e2e91783288dd61
---
M includes/mail/UserMailer.php
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/34/265434/1
diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php
index 85595f1..ded5dec 100644
--- a/includes/mail/UserMailer.php
+++ b/includes/mail/UserMailer.php
@@ -116,7 +116,7 @@
*/
public static function send( $to, $from, $subject, $body, $options =
array() ) {
global $wgAllowHTMLEmail;
- $contentType = 'text/plain; charset=UTF-8';
+
if ( !is_array( $options ) ) {
// Old calling style
wfDeprecated( __METHOD__ . ' with $replyto as 5th
parameter', '1.26' );
@@ -124,6 +124,9 @@
if ( func_num_args() === 6 ) {
$options['contentType'] = func_get_arg( 5 );
}
+ }
+ if ( !isset( $options['contentType'] ) ) {
+ $options['contentType'] = 'text/plain; charset=UTF-8';
}
if ( !is_array( $to ) ) {
@@ -327,8 +330,7 @@
$body = str_replace( "\n", "\r\n", $body );
}
$headers['MIME-Version'] = '1.0';
- $headers['Content-type'] = ( is_null( $contentType ) ?
- 'text/plain; charset=UTF-8' : $contentType );
+ $headers['Content-type'] = $contentType;
$headers['Content-transfer-encoding'] = '8bit';
}
--
To view, visit https://gerrit.wikimedia.org/r/265434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e251962fe731fa78f6867a14e2e91783288dd61
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
