https://www.mediawiki.org/wiki/Special:Code/MediaWiki/111819
Revision: 111819
Author: hashar
Date: 2012-02-18 10:37:11 +0000 (Sat, 18 Feb 2012)
Log Message:
-----------
revert r111765 bug 34421 avoid duplicate Subject headers
Was removing subjects when sending mails through PEAR.
Modified Paths:
--------------
trunk/phase3/includes/UserMailer.php
Modified: trunk/phase3/includes/UserMailer.php
===================================================================
--- trunk/phase3/includes/UserMailer.php 2012-02-18 10:36:32 UTC (rev
111818)
+++ trunk/phase3/includes/UserMailer.php 2012-02-18 10:37:11 UTC (rev
111819)
@@ -185,6 +185,7 @@
$headers['Reply-To'] = $replyto->toString();
}
+ $headers['Subject'] = self::quotedPrintable( $subject );
$headers['Date'] = date( 'r' );
$headers['MIME-Version'] = '1.0';
$headers['Content-type'] = ( is_null( $contentType ) ?
@@ -254,11 +255,10 @@
$safeMode = wfIniGetBool( 'safe_mode' );
foreach ( $dest as $recip ) {
- $quoted_subject = self::quotedPrintable(
$subject );
if ( $safeMode ) {
- $sent = mail( $recip, $quoted_subject,
$body, $headers );
+ $sent = mail( $recip,
self::quotedPrintable( $subject ), $body, $headers );
} else {
- $sent = mail( $recip, $quoted_subject,
$body, $headers, $wgAdditionalMailParams );
+ $sent = mail( $recip,
self::quotedPrintable( $subject ), $body, $headers, $wgAdditionalMailParams );
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
