From d8ab214e02e59e580a1b680b5f43d8260bdf03d2 Mon Sep 17 00:00:00 2001 From: Antoine Musso Date: Sat, 18 Feb 2012 10:57:34 +0000 Subject: [PATCH] (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. --- includes/UserMailer.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/includes/UserMailer.php b/includes/UserMailer.php index d72f1fd12a..88a7d6130e 100644 --- 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" ); -- 2.20.1