Changeset 24fe97e in github

Timestamp:

Jan 10, 2007 3:46:15 AM (6 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

ede6c5f

Parents:

3a7431a

Message:

mb_encode_mimeheader quirks; removed unused var

File:

• program/steps/mail/sendmail.inc (modified) (2 diffs)

program/steps/mail/sendmail.inc

@@ -302 +302 @@
 unset($MAIL_MIME->_parts);
 
-$msg_subject = $headers['Subject'];
-
 if ($MBSTRING && function_exists("mb_encode_mimeheader"))
 {
+  mb_internal_encoding($message_charset);
+  $headers['Subject'] = mb_encode_mimeheader($headers['Subject'], $message_charset, 'Q');
   mb_internal_encoding($CHARSET);
-  $headers['Subject'] = mb_encode_mimeheader($headers['Subject'], $message_charset, 'Q');
 }
 
@@ -359 +358 @@
   
     if (ini_get('safe_mode'))
-      $sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str);
+      $sent = mail($headers_enc['To'], $headers['Subject'], $msg_body, $header_str);
     else
-      $sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str, "-f$from");
+      $sent = mail($headers_enc['To'], $headers['Subject'], $msg_body, $header_str, "-f$from");
     }