Commitd4a87d2

authored and

committed

[Mime] Fix embed logic for background attributes

1 parent6e3d5c1 commitd4a87d2Copy full SHA for d4a87d2

File tree

+19

-2

lines changed

+19

-2

lines changed

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -460,8 +460,17 @@ private function prepareParts(): ?array`
`460`	`460`	`if (null !==$this->html) {`
`461`	`461`	`$htmlPart =newTextPart($html,$this->htmlCharset,'html');`
`462`	`462`	`$html =$htmlPart->getBody();`
`463`		`-preg_match_all('(<img\s+[^>]src\s=\s*(?:([\'"])cid:([^"]+)\\1\|cid:([^>\s]+)))i',$html,$names);`
`464`		`-$names =array_filter(array_unique(array_merge($names[2],$names[3])));`
	`463`	`+`
	`464`	`+$regexes = [`
	`465`	`+'<img\s+[^>]src\s=\s*(?:([\'"])cid:([^"]+)\\1\|cid:([^>\s]+))',`
	`466`	`+'<\w+\s+[^>]background\s=\s*(?:([\'"])cid:([^"]+)\\1\|cid:([^>\s]+))',`
	`467`	`+ ];`
	`468`	`+$tmpMatches = [];`
	`469`	`+foreach ($regexesas$regex) {`
	`470`	`+preg_match_all('/'.$regex.'/i',$html,$tmpMatches);`
	`471`	`+$names =array_merge($names,$tmpMatches[2],$tmpMatches[3]);`
	`472`	`+ }`
	`473`	`+$names =array_filter(array_unique($names));`
`465`	`474`	`}`
`466`	`475`
`467`	`476`	`$attachmentParts =$inlineParts = [];`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -351,6 +351,14 @@ public function testGenerateBody()`
`351`	`351`	`// 2 parts only, not 3 (text + embedded image once)`
`352`	`352`	`$this->assertCount(2,$parts =$body->getParts());`
`353`	`353`	`$this->assertStringMatchesFormat('html content <img src=3D"cid:%s@symfony">',$parts[0]->bodyToString());`
	`354`	`+`
	`355`	`+$e = (newEmail())->from('me@example.com')->to('you@example.com');`
	`356`	`+$e->html('<div background="cid:test.gif"></div>');`
	`357`	`+$e->embed($image,'test.gif');`
	`358`	`+$body =$e->getBody();`
	`359`	`+$this->assertInstanceOf(RelatedPart::class,$body);`
	`360`	`+$this->assertCount(2,$parts =$body->getParts());`
	`361`	`+$this->assertStringMatchesFormat('<div background=3D"cid:%s@symfony"></div>',$parts[0]->bodyToString());`
`354`	`362`	`}`
`355`	`363`
`356`	`364`	`publicfunctiontestAttachments()`

Comments

(0)