From: Mark A. Hershberger Date: Thu, 7 Jul 2011 17:43:31 +0000 (+0000) Subject: w/s fixup before patch X-Git-Tag: 1.31.0-rc.0~29008 X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=ab6a72a033e086c5fd59fe5fb921b29fb9295883;p=lhc%2Fweb%2Fwiklou.git w/s fixup before patch --- diff --git a/includes/UserMailer.php b/includes/UserMailer.php index cabccac61d..3fbf114def 100644 --- a/includes/UserMailer.php +++ b/includes/UserMailer.php @@ -213,7 +213,7 @@ class UserMailer { $headers = array( "MIME-Version: 1.0", - "Content-type: $contentType", + "Content-type: $contentType", "Content-Transfer-Encoding: 8bit", "X-Mailer: MediaWiki mailer", "From: " . $from->toString(), @@ -292,7 +292,7 @@ class UserMailer { return $string; } $out = "=?$charset?Q?"; - $out .= preg_replace_callback( "/([$replace])/", + $out .= preg_replace_callback( "/([$replace])/", array( __CLASS__, 'quotedPrintableCallback' ), $string ); $out .= '?='; return $out; @@ -524,7 +524,7 @@ class EmailNotification { */ $keys['$NEWPAGE'] = wfMsgForContent( 'enotif_lastdiff', $this->title->getFullURL( "oldid={$this->oldid}&diff=next" ) ); - } + } $body = strtr( $body, $keys ); $pagetitle = $this->title->getPrefixedText(); @@ -545,8 +545,8 @@ class EmailNotification { $adminAddress = new MailAddress( $wgPasswordSender, $wgPasswordSenderName ); $editorAddress = new MailAddress( $editor ); if ( $wgEnotifRevealEditorAddress - && ( $editor->getEmail() != '' ) - && $editor->getOption( 'enotifrevealaddr' ) ) { + && ( $editor->getEmail() != '' ) + && $editor->getOption( 'enotifrevealaddr' ) ) { if ( $wgEnotifFromEditor ) { $from = $editorAddress; } else {