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

CS

This commit is contained in:
Marcus Bointon 2025-10-06 09:07:54 +02:00
parent e8f4d86c66
commit 7251db8b19
No known key found for this signature in database
GPG Key ID: DE31CD6EB646AA24
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PHPMailer.php
View File

@ -4397,7 +4397,7 @@ class PHPMailer
$cid_domain = '@phpmailer.0'; $cid_domain = '@phpmailer.0';
if (filter_var($this->From, FILTER_VALIDATE_EMAIL)) { if (filter_var($this->From, FILTER_VALIDATE_EMAIL)) {
//prepend with a character to create valid RFC822 string in order to validate //prepend with a character to create valid RFC822 string in order to validate
$cid_domain = substr( $this->From, strrpos( $this->From, '@') + 1); $cid_domain = substr($this->From, strrpos($this->From, '@') + 1);
} }
preg_match_all('/(?<!-)(src|background)=["\'](.*)["\']/Ui', $message, $images); preg_match_all('/(?<!-)(src|background)=["\'](.*)["\']/Ui', $message, $images);

2
test/PHPMailer/PHPMailerTest.php
View File

@ -620,7 +620,7 @@ EOT;
{ {
$result = $this->Mail->setFrom('test@example.com'); $result = $this->Mail->setFrom('test@example.com');
self::assertTrue($result, 'setFrom failed'); self::assertTrue($result, 'setFrom failed');
$this->Mail->msgHTML('<!DOCTYPE html> $this->Mail->msgHTML('<!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>