Make WordPress Core


Ignore:
Timestamp:
06/14/2022 02:36:29 PM (2 years ago)
Author:
desrosj
Message:

External Libraries: Upgrade PHPMailer to version 6.6.2.

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

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

Props ayeshrajans, jrf.
Fixes #55976.

File:
1 edited

Legend:

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

    r52811 r53500  
    751751     * @var string
    752752     */
    753     const VERSION = '6.6.0';
     753    const VERSION = '6.6.2';
    754754
    755755    /**
     
    10671067     *
    10681068     * @param string $kind    One of 'to', 'cc', 'bcc', or 'ReplyTo'
    1069      * @param string $address The email address to send, resp. to reply to
    1070      * @param string $name
     1069     * @param string $address The email address
     1070     * @param string $name    An optional username associated with the address
    10711071     *
    10721072     * @throws Exception
     
    10761076    protected function addOrEnqueueAnAddress($kind, $address, $name)
    10771077    {
    1078         $address = trim($address);
    1079         $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
    1080         $pos = strrpos($address, '@');
     1078        $pos = false;
     1079        if ($address !== null) {
     1080            $address = trim($address);
     1081            $pos = strrpos($address, '@');
     1082        }
    10811083        if (false === $pos) {
    10821084            //At-sign is missing.
     
    10951097            return false;
    10961098        }
     1099        if ($name !== null) {
     1100            $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
     1101        } else {
     1102            $name = '';
     1103        }
    10971104        $params = [$kind, $address, $name];
    10981105        //Enqueue addresses with IDN until we know the PHPMailer::$CharSet.
     1106        //Domain is assumed to be whatever is after the last @ symbol in the address
    10991107        if (static::idnSupported() && $this->has8bitChars(substr($address, ++$pos))) {
    11001108            if ('Reply-To' !== $kind) {
Note: See TracChangeset for help on using the changeset viewer.