| Index: trunk/phase3/includes/UserMailer.php |
| — | — | @@ -142,10 +142,6 @@ |
| 143 | 143 | $headers['MIME-Version'] = '1.0'; |
| 144 | 144 | $headers['Content-type'] = (is_null($contentType) ? |
| 145 | 145 | 'text/plain; charset='.$wgOutputEncoding : $contentType); |
| 146 | | - if(is_null($contentType)) |
| 147 | | - $headers['Content-type'] = 'text/plain; charset='.$wgOutputEncoding; |
| 148 | | - else |
| 149 | | - $headers['Content-type'] = $contentType; |
| 150 | 146 | $headers['Content-transfer-encoding'] = '8bit'; |
| 151 | 147 | $headers['Message-ID'] = "<$msgid@" . $wgSMTP['IDHost'] . '>'; // FIXME |
| 152 | 148 | $headers['X-Mailer'] = 'MediaWiki mailer'; |