r111819 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r111818‎ | r111819 | r111820 >
Date:10:37, 18 February 2012
Author:hashar
Status:ok
Tags:
Comment:
revert r111765 bug 34421 avoid duplicate Subject headers

Was removing subjects when sending mails through PEAR.
Modified paths:
  • /trunk/phase3/includes/UserMailer.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/UserMailer.php
@@ -185,6 +185,7 @@
186186 $headers['Reply-To'] = $replyto->toString();
187187 }
188188
 189+ $headers['Subject'] = self::quotedPrintable( $subject );
189190 $headers['Date'] = date( 'r' );
190191 $headers['MIME-Version'] = '1.0';
191192 $headers['Content-type'] = ( is_null( $contentType ) ?
@@ -254,11 +255,10 @@
255256
256257 $safeMode = wfIniGetBool( 'safe_mode' );
257258 foreach ( $dest as $recip ) {
258 - $quoted_subject = self::quotedPrintable( $subject );
259259 if ( $safeMode ) {
260 - $sent = mail( $recip, $quoted_subject, $body, $headers );
 260+ $sent = mail( $recip, self::quotedPrintable( $subject ), $body, $headers );
261261 } else {
262 - $sent = mail( $recip, $quoted_subject, $body, $headers, $wgAdditionalMailParams );
 262+ $sent = mail( $recip, self::quotedPrintable( $subject ), $body, $headers, $wgAdditionalMailParams );
263263 }
264264 }
265265

Follow-up revisions

RevisionCommit summaryAuthorDate
r111820(bug 34421) avoid duplicate Subject headers in mail...hashar10:57, 18 February 2012
r111832(bug 34421) duplicate Subject / wrong To: headers in mail...hashar15:34, 18 February 2012
r111925MFT to 1.19wmf1 r111832...hashar13:32, 20 February 2012

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r111765(bug 34421) avoid duplicate Subject headers...hashar17:02, 17 February 2012

Status & tagging log