Merge branch 'release/4.0.1'

rhukster · rhukster · commit 2563fe9964e1 · 2023-05-20T07:46:00.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v4.0.1
+## 05/20/2023
+
+1. [](#bugfix)
+   * Fixed a bug with Email 4.0 ignoring `template:` parameter when dealing with multiple body sections
+
 # v4.0.0
 ## 05/09/2023
 
diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Email
 slug: email
 type: plugin
-version: 4.0.0
+version: 4.0.1
 testing: false
 description: Enables the emailing system for Grav
 icon: envelope
diff --git a/classes/Email.php b/classes/Email.php
@@ -184,6 +184,9 @@ public function buildMessage(array $params, array $vars = []): Message
                             if (isset($body_part['content_type'])) {
                                 $params_part['content_type'] = $body_part['content_type'];
                             }
+                            if (isset($body_part['template'])) {
+                                $params_part['template'] = $body_part['template'];
+                            }
                             if (isset($body_part['body'])) {
                                 $this->processBody($message, $params_part, $vars, $twig, $body_part['body']);
                             }

Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,9 @@ public function buildMessage(array $params, array $vars = []): Message`
`184`	`184`	`if (isset($body_part['content_type'])) {`
`185`	`185`	`$params_part['content_type'] = $body_part['content_type'];`
`186`	`186`	`}`
	`187`	`+ if (isset($body_part['template'])) {`
	`188`	`+ $params_part['template'] = $body_part['template'];`
	`189`	`+ }`
`187`	`190`	`if (isset($body_part['body'])) {`
`188`	`191`	`$this->processBody($message, $params_part, $vars, $twig, $body_part['body']);`
`189`	`192`	`}`