https://www.mediawiki.org/wiki/Special:Code/MediaWiki/111820
Revision: 111820
Author: hashar
Date: 2012-02-18 10:57:34 +0000 (Sat, 18 Feb 2012)
Log Message:
-----------
(bug 34421) avoid duplicate Subject headers in mail
r93397 duplicated the Subject header since it was passed both as an
argument of mail() and in the additional headers array.
This is r111765 done right.
Tested using both Pear and mail() methods.
Modified Paths:
--------------
trunk/phase3/includes/UserMailer.php
Modified: trunk/phase3/includes/UserMailer.php
===================================================================
--- trunk/phase3/includes/UserMailer.php 2012-02-18 10:37:11 UTC (rev
111819)
+++ trunk/phase3/includes/UserMailer.php 2012-02-18 10:57:34 UTC (rev
111820)
@@ -244,6 +244,8 @@
$endl = "\n";
}
+ # Subject header is unneeded since it an argument of
mail()
+ unset( $headers['Subject'] );
$headers = self::arrayToHeaderString( $headers, $endl );
wfDebug( "Sending mail via internal mail() function\n"
);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
