revert r111765 bug 34421 avoid duplicate Subject headers

Was removing subjects when sending mails through PEAR.

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 0a02e52..d72f1fd 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -185,6 +185,7 @@ class UserMailer {
                        $headers['Reply-To'] = $replyto->toString();
                }
 
+               $headers['Subject'] = self::quotedPrintable( $subject );
                $headers['Date'] = date( 'r' );
                $headers['MIME-Version'] = '1.0';
                $headers['Content-type'] = ( is_null( $contentType ) ?
@@ -254,11 +255,10 @@ class UserMailer {
 
                        $safeMode = wfIniGetBool( 'safe_mode' );
                        foreach ( $dest as $recip ) {
-                               $quoted_subject = self::quotedPrintable( $subject );
                                if ( $safeMode ) {
-                                       $sent = mail( $recip, $quoted_subject, $body, $headers );
+                                       $sent = mail( $recip, self::quotedPrintable( $subject ), $body, $headers );
                                } else {
-                                       $sent = mail( $recip, $quoted_subject,  $body, $headers, $wgAdditionalMailParams );
+                                       $sent = mail( $recip, self::quotedPrintable( $subject ), $body, $headers, $wgAdditionalMailParams );
                                }
                        }