Make WordPress Core

Changeset 53917


Ignore:
Timestamp:
08/22/2022 12:24:30 PM (22 months ago)
Author:
SergeyBiryukov
Message:

External Libraries: Upgrade PHPMailer to version 6.6.4.

This is a maintenance release with minor changes:

  • Add text/csv MIME type.
  • Fix DKIM when sending to anonymous group via mail().

Release notes:
https://github.com/PHPMailer/PHPMailer/releases/tag/v6.6.4

For a full list of changes in this update, see the PHPMailer GitHub:
https://github.com/PHPMailer/PHPMailer/compare/v6.6.3...v6.6.4

Follow-up to [50628], [50799], [51169], [51634], [51635], [52252], [52749], [52811], [53500], [53535].

Props jrf, Synchro.
Fixes #56016.

Location:
trunk/src/wp-includes/PHPMailer
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/PHPMailer/PHPMailer.php

    r53535 r53917  
    351351
    352352    /**
    353      * SMTP auth type.
    354      * Options are CRAM-MD5, LOGIN, PLAIN, XOAUTH2, attempted in that order if not specified.
     353     * SMTP authentication type. Options are CRAM-MD5, LOGIN, PLAIN, XOAUTH2.
     354     * If not specified, the first one from that list that the server supports will be selected.
    355355     *
    356356     * @var string
     
    751751     * @var string
    752752     */
    753     const VERSION = '6.6.3';
     753    const VERSION = '6.6.4';
    754754
    755755    /**
     
    10971097            return false;
    10981098        }
    1099         if ($name !== null) {
     1099        if ($name !== null && is_string($name)) {
    11001100            $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
    11011101        } else {
     
    12891289    public function setFrom($address, $name = '', $auto = true)
    12901290    {
    1291         $address = trim($address);
     1291        $address = trim((string)$address);
    12921292        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
    12931293        //Don't validate now addresses with IDN. Will be done in send().
     
    18941894            $toArr[] = $this->addrFormat($toaddr);
    18951895        }
    1896         $to = implode(', ', $toArr);
     1896        $to = trim(implode(', ', $toArr));
     1897
     1898        //If there are no To-addresses (e.g. when sending only to BCC-addresses)
     1899        //the following should be added to get a correct DKIM-signature.
     1900        //Compare with $this->preSend()
     1901        if ($to === '') {
     1902            $to = 'undisclosed-recipients:;';
     1903        }
    18971904
    18981905        $params = null;
     
    44734480            'xml' => 'text/xml',
    44744481            'xsl' => 'text/xml',
     4482            'csv' => 'text/csv',
    44754483            'wmv' => 'video/x-ms-wmv',
    44764484            'mpeg' => 'video/mpeg',
  • trunk/src/wp-includes/PHPMailer/SMTP.php

    r53535 r53917  
    3636     * @var string
    3737     */
    38     const VERSION = '6.6.3';
     38    const VERSION = '6.6.4';
    3939
    4040    /**
Note: See TracChangeset for help on using the changeset viewer.