| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -1288,9 +1288,6 @@ |
| 1289 | 1289 | # Replacing an existing section; roll out the big guns |
| 1290 | 1290 | global $wgParser; |
| 1291 | 1291 | $text = $wgParser->replaceSection( $oldtext, $section, $text ); |
| 1292 | | - # If $section is bogus, replaceSection() will be a no-op |
| 1293 | | - if($text == $oldtext) |
| 1294 | | - return null; |
| 1295 | 1292 | } |
| 1296 | 1293 | |
| 1297 | 1294 | } |
| Index: trunk/phase3/includes/UserMailer.php |
| — | — | @@ -98,10 +98,9 @@ |
| 99 | 99 | * @param $subject String: email's subject. |
| 100 | 100 | * @param $body String: email's text. |
| 101 | 101 | * @param $replyto String: optional reply-to email (default: null). |
| 102 | | - * @param $contentType String: optional custom Content-Type |
| 103 | 102 | * @return mixed True on success, a WikiError object on failure. |
| 104 | 103 | */ |
| 105 | | - static function send( $to, $from, $subject, $body, $replyto=null, $contentType=null ) { |
| | 104 | + static function send( $to, $from, $subject, $body, $replyto=null ) { |
| 106 | 105 | global $wgSMTP, $wgOutputEncoding, $wgErrorString, $wgEnotifImpersonal; |
| 107 | 106 | global $wgEnotifMaxRecips; |
| 108 | 107 | |
| — | — | @@ -140,12 +139,7 @@ |
| 141 | 140 | $headers['Subject'] = wfQuotedPrintable( $subject ); |
| 142 | 141 | $headers['Date'] = date( 'r' ); |
| 143 | 142 | $headers['MIME-Version'] = '1.0'; |
| 144 | | - $headers['Content-type'] = (is_null($contentType) ? |
| 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; |
| | 143 | + $headers['Content-type'] = 'text/plain; charset='.$wgOutputEncoding; |
| 150 | 144 | $headers['Content-transfer-encoding'] = '8bit'; |
| 151 | 145 | $headers['Message-ID'] = "<$msgid@" . $wgSMTP['IDHost'] . '>'; // FIXME |
| 152 | 146 | $headers['X-Mailer'] = 'MediaWiki mailer'; |
| — | — | @@ -176,11 +170,9 @@ |
| 177 | 171 | } else { |
| 178 | 172 | $endl = "\n"; |
| 179 | 173 | } |
| 180 | | - $ctype = (is_null($contentType) ? |
| 181 | | - 'text/plain; charset='.$wgOutputEncoding : $contentType); |
| 182 | 174 | $headers = |
| 183 | 175 | "MIME-Version: 1.0$endl" . |
| 184 | | - "Content-type: $ctype$endl" . |
| | 176 | + "Content-type: text/plain; charset={$wgOutputEncoding}$endl" . |
| 185 | 177 | "Content-Transfer-Encoding: 8bit$endl" . |
| 186 | 178 | "X-Mailer: MediaWiki mailer$endl". |
| 187 | 179 | 'From: ' . $from->toString(); |