From: Greg Sabino Mullane <greg@users.mediawiki.org>
Date: Thu, 18 Sep 2008 15:19:44 +0000 (+0000)
Subject: Duplicate code
X-Git-Tag: 1.31.0-rc.0~45239
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%20%22id_auteur=%24id%22%29%20.%20%22?a=commitdiff_plain;h=5f2042e3fae998bb4679ae15a3cef4bc14ed9118;p=lhc%2Fweb%2Fwiklou.git

Duplicate code
---

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 436b1e48b5..cd889df9be 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -142,10 +142,6 @@ class UserMailer {
 			$headers['MIME-Version'] = '1.0';
 			$headers['Content-type'] = (is_null($contentType) ?
 					'text/plain; charset='.$wgOutputEncoding : $contentType);
-			if(is_null($contentType))
-				$headers['Content-type'] = 'text/plain; charset='.$wgOutputEncoding;
-			else
-				$headers['Content-type'] = $contentType;
 			$headers['Content-transfer-encoding'] = '8bit';
 			$headers['Message-ID'] = "<$msgid@" . $wgSMTP['IDHost'] . '>'; // FIXME
 			$headers['X-Mailer'] = 'MediaWiki mailer';