dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6394ac7
)
w/s fixup before patch
author
Mark A. Hershberger
<mah@users.mediawiki.org>
Thu, 7 Jul 2011 17:43:31 +0000
(17:43 +0000)
committer
Mark A. Hershberger
<mah@users.mediawiki.org>
Thu, 7 Jul 2011 17:43:31 +0000
(17:43 +0000)
includes/UserMailer.php
patch
|
blob
|
history
diff --git
a/includes/UserMailer.php
b/includes/UserMailer.php
index
cabccac
..
3fbf114
100644
(file)
--- a/
includes/UserMailer.php
+++ b/
includes/UserMailer.php
@@
-213,7
+213,7
@@
class UserMailer {
$headers = array(
"MIME-Version: 1.0",
$headers = array(
"MIME-Version: 1.0",
- "Content-type: $contentType",
+ "Content-type: $contentType",
"Content-Transfer-Encoding: 8bit",
"X-Mailer: MediaWiki mailer",
"From: " . $from->toString(),
"Content-Transfer-Encoding: 8bit",
"X-Mailer: MediaWiki mailer",
"From: " . $from->toString(),
@@
-292,7
+292,7
@@
class UserMailer {
return $string;
}
$out = "=?$charset?Q?";
return $string;
}
$out = "=?$charset?Q?";
- $out .= preg_replace_callback( "/([$replace])/",
+ $out .= preg_replace_callback( "/([$replace])/",
array( __CLASS__, 'quotedPrintableCallback' ), $string );
$out .= '?=';
return $out;
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" ) );
*/
$keys['$NEWPAGE'] = wfMsgForContent( 'enotif_lastdiff',
$this->title->getFullURL( "oldid={$this->oldid}&diff=next" ) );
- }
+
}
$body = strtr( $body, $keys );
$pagetitle = $this->title->getPrefixedText();
$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
$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 {
if ( $wgEnotifFromEditor ) {
$from = $editorAddress;
} else {