Exclude custom Mime-Version from PHPMailer's SMTP payload

textpattern · Mar 17, 2024 · c9a9769 · c9a9769
1 parent 3e1268e
commit c9a9769
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/textpattern/vendors/Textpattern/Mail/Adapter/SMTPMail.php b/textpattern/vendors/Textpattern/Mail/Adapter/SMTPMail.php
@@ -259,7 +259,7 @@ public function send()
         // Custom headers come first so important ones (like From) get overwritten by sane values.
         foreach ($this->mail->headers as $hkey => $hval) {
             // Skip a few that PHPMailer handles automatically.
-            if (!in_array($hkey, array('Content-Transfer-Encoding', 'Content-Type'))) {
+            if (!in_array($hkey, array('Content-Transfer-Encoding', 'Content-Type', 'Mime-Version'))) {
                 $this->mailer->addCustomHeader($hkey, $hval);
             }
         }

diff --git a/textpattern/vendors/Textpattern/Mail/Encode.php b/textpattern/vendors/Textpattern/Mail/Encode.php
@@ -159,7 +159,7 @@ public function escapeHeader($string)
      * Extract email and name from a combined RFC email string.
      *
      * @param  string $string The string
-     * @return array  The name and email component parts
+     * @return array  The name and email component parts, if given
      */
 
     public function fromRfcEmail($rfc_email_string) {