From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 16 Oct 2011 19:52:46 +0000 (+0000)
Subject: Remove duplicate setting of From
X-Git-Tag: 1.31.0-rc.0~27064
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=e27527f3f19b6f8fca5f546a31785e0c7f3537ef;p=lhc%2Fweb%2Fwiklou.git

Remove duplicate setting of From
---

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index fdb209fb19..0789f555d3 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -193,7 +193,6 @@ class UserMailer {
 
 		$headers['Message-ID'] = self::makeMsgId();
 		$headers['X-Mailer'] = 'MediaWiki mailer';
-		$headers['From'] = $from->toString();
 
 		$ret = wfRunHooks( 'AlternateUserMailer', array( $headers, $to, $from, $subject, $body ) );
 		if ( $ret === false ) {