[4] Replace placeholders in file names of attachments in Mail Templates (#34321)

Phil E. Taylor · web-flow · commit b3133553f99b · 2021-07-21T22:47:44.000+01:00
diff --git a/libraries/src/Mail/MailTemplate.php b/libraries/src/Mail/MailTemplate.php
@@ -495,6 +495,10 @@ protected function getAttachmentName(string $file, string $name): string
 			return '';
 		}
 
+		// Replace any placeholders.
+		$name = $this->replaceTags($name, $this->data);
+
+		// Get the file extension.
 		$ext = File::getExt($file);
 
 		// Strip off extension from $name and append extension of $file, if any

Original file line number	Diff line number	Diff line change
`@@ -495,6 +495,10 @@ protected function getAttachmentName(string $file, string $name): string`
`495`	`495`	`return '';`
`496`	`496`	`}`
`497`	`497`
	`498`	`+ // Replace any placeholders.`
	`499`	`+ $name = $this->replaceTags($name, $this->data);`
	`500`	`+`
	`501`	`+ // Get the file extension.`
`498`	`502`	`$ext = File::getExt($file);`
`499`	`503`
`500`	`504`	`// Strip off extension from $name and append extension of $file, if any`