Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F9052
MWUserMailer.patch
Public
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Authored By
•
bzimport
Nov 22 2014, 12:16 AM
2014-11-22 00:16:07 (UTC+0)
Size
985 B
Referenced Files
None
Subscribers
None
MWUserMailer.patch
View Options
Index: includes/UserMailer.php
===================================================================
--- includes/UserMailer.php (revision 111796)
+++ includes/UserMailer.php (working copy)
@@ -170,15 +170,14 @@
}
if ( count( $dest ) == 0 ) {
return Status::newFatal( 'user-mail-no-addy' );
+ } elseif ( count( $dest ) == 1 ) {
+ $dest = array( $dest[0] );
+ } else {
+ $dest = array( 'undisclosed-recipients:;' );
}
$headers['From'] = $from->toString();
$headers['Return-Path'] = $from->address;
- if ( count( $to ) == 1 ) {
- $headers['To'] = $to[0]->toString();
- } else {
- $headers['To'] = 'undisclosed-recipients:;';
- }
if ( $replyto ) {
$headers['Reply-To'] = $replyto->toString();
@@ -201,6 +200,8 @@
}
if ( is_array( $wgSMTP ) ) {
+ $headers['Subject'] = self::quotedPrintable( $subject );
+
if ( function_exists( 'stream_resolve_include_path' ) ) {
$found = stream_resolve_include_path( 'Mail.php' );
} else {
File Metadata
Details
Attached
Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
8566
Default Alt Text
MWUserMailer.patch (985 B)
Attached To
Mode
T36421: mutiple headers in emails from UserMailer
Attached
Detach File
Event Timeline
Log In to Comment