dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9c22220
)
(bug 34421) avoid duplicate Subject headers in mail
author
Antoine Musso
<hashar@users.mediawiki.org>
Sat, 18 Feb 2012 10:57:34 +0000
(10:57 +0000)
committer
Antoine Musso
<hashar@users.mediawiki.org>
Sat, 18 Feb 2012 10:57:34 +0000
(10:57 +0000)
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.
includes/UserMailer.php
patch
|
blob
|
history
diff --git
a/includes/UserMailer.php
b/includes/UserMailer.php
index
d72f1fd
..
88a7d61
100644
(file)
--- a/
includes/UserMailer.php
+++ b/
includes/UserMailer.php
@@
-244,6
+244,8
@@
class UserMailer {
$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" );