| Index: trunk/phase3/includes/UserMailer.php |
| — | — | @@ -213,7 +213,7 @@ |
| 214 | 214 | |
| 215 | 215 | $headers = array( |
| 216 | 216 | "MIME-Version: 1.0", |
| 217 | | - "Content-type: $contentType", |
| | 217 | + "Content-type: $contentType", |
| 218 | 218 | "Content-Transfer-Encoding: 8bit", |
| 219 | 219 | "X-Mailer: MediaWiki mailer", |
| 220 | 220 | "From: " . $from->toString(), |
| — | — | @@ -292,7 +292,7 @@ |
| 293 | 293 | return $string; |
| 294 | 294 | } |
| 295 | 295 | $out = "=?$charset?Q?"; |
| 296 | | - $out .= preg_replace_callback( "/([$replace])/", |
| | 296 | + $out .= preg_replace_callback( "/([$replace])/", |
| 297 | 297 | array( __CLASS__, 'quotedPrintableCallback' ), $string ); |
| 298 | 298 | $out .= '?='; |
| 299 | 299 | return $out; |
| — | — | @@ -524,7 +524,7 @@ |
| 525 | 525 | */ |
| 526 | 526 | $keys['$NEWPAGE'] = wfMsgForContent( 'enotif_lastdiff', |
| 527 | 527 | $this->title->getFullURL( "oldid={$this->oldid}&diff=next" ) ); |
| 528 | | - } |
| | 528 | + } |
| 529 | 529 | |
| 530 | 530 | $body = strtr( $body, $keys ); |
| 531 | 531 | $pagetitle = $this->title->getPrefixedText(); |
| — | — | @@ -545,8 +545,8 @@ |
| 546 | 546 | $adminAddress = new MailAddress( $wgPasswordSender, $wgPasswordSenderName ); |
| 547 | 547 | $editorAddress = new MailAddress( $editor ); |
| 548 | 548 | if ( $wgEnotifRevealEditorAddress |
| 549 | | - && ( $editor->getEmail() != '' ) |
| 550 | | - && $editor->getOption( 'enotifrevealaddr' ) ) { |
| | 549 | + && ( $editor->getEmail() != '' ) |
| | 550 | + && $editor->getOption( 'enotifrevealaddr' ) ) { |
| 551 | 551 | if ( $wgEnotifFromEditor ) { |
| 552 | 552 | $from = $editorAddress; |
| 553 | 553 | } else { |