mirror
/
PHPMailer
mirror of https://github.com/PHPMailer/PHPMailer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3208 from SirLouen/patch/3207 

Sorting the Array problem in doCallback
This commit is contained in:
Marcus Bointon 2025-08-22 15:15:04 +02:00 committed by GitHub
parent f78d341f06 19f17f8aeb
commit d43654d445
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/PHPMailer.php
View File

@ -1842,16 +1842,18 @@ class PHPMailer
fwrite($mail, $body); fwrite($mail, $body);
$result = pclose($mail); $result = pclose($mail);
$addrinfo = static::parseAddresses($toAddr, true, $this->CharSet); $addrinfo = static::parseAddresses($toAddr, true, $this->CharSet);
$this->doCallback( foreach ($addrinfo as $addr) {
($result === 0), $this->doCallback(
[[$addrinfo['address'], $addrinfo['name']]], ($result === 0),
$this->cc, [[$addr['address'], $addr['name']]],
$this->bcc, $this->cc,
$this->Subject, $this->bcc,
$body, $this->Subject,
$this->From, $body,
[] $this->From,
); []
);
}
$this->edebug("Result: " . ($result === 0 ? 'true' : 'false')); $this->edebug("Result: " . ($result === 0 ? 'true' : 'false'));
if (0 !== $result) { if (0 !== $result) {
throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
@ -2017,16 +2019,18 @@ class PHPMailer
foreach ($toArr as $toAddr) { foreach ($toArr as $toAddr) {
$result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params); $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params);
$addrinfo = static::parseAddresses($toAddr, true, $this->CharSet); $addrinfo = static::parseAddresses($toAddr, true, $this->CharSet);
$this->doCallback( foreach ($addrinfo as $addr) {
$result, $this->doCallback(
[[$addrinfo['address'], $addrinfo['name']]], $result,
$this->cc, [[$addr['address'], $addr['name']]],
$this->bcc, $this->cc,
$this->Subject, $this->bcc,
$body, $this->Subject,
$this->From, $body,
[] $this->From,
); []
);
}
} }
} else { } else {
$result = $this->mailPassthru($to, $this->Subject, $body, $header, $params); $result = $this->mailPassthru($to, $this->Subject, $body, $header, $params);