Merge branch 'release/3.1.4'

getgrav · Nov 16, 2021 · 0722d61 · 0722d61
2 parents 859a564 + bebb2f1
commit 0722d61
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v3.1.4
+## 11/16/2021
+
+1. [](#improved)
+    * Added second parameter to `Email::send()` to get failed recipients
+
 # v3.1.3
 ## 07/19/2021
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Email
 slug: email
 type: plugin
-version: 3.1.3
+version: 3.1.4
 testing: false
 description: Enables the emailing system for Grav
 icon: envelope

diff --git a/classes/Email.php b/classes/Email.php
@@ -101,13 +101,14 @@ public function image($data = null, $filename = null, $contentType = null)
      * Send email.
      *
      * @param \Swift_Message $message
+     * @param array|null $failedRecipients
      * @return int
      */
-    public function send($message)
+    public function send($message, &$failedRecipients = null)
     {
         $mailer = $this->getMailer();
 
-        $result = $mailer ? $mailer->send($message) : 0;
+        $result = $mailer ? $mailer->send($message, $failedRecipients) : 0;
 
         // Check if emails and debugging are both enabled.
         if ($mailer && $this->debug()) {
@@ -181,24 +182,26 @@ public function buildMessage(array $params, array $vars = [])
             switch ($key) {
                 case 'body':
                     if (is_string($value)) {
-                        $body = $twig->processString($value, $vars);
+                        if (strpos($value, '{{') !== false || strpos($value, '{%') !== false) {
+                            $body = $twig->processString($value, $vars);
+                        } else {
+                            $body = $value;
+                        }
 
                         if ($params['process_markdown'] && $params['content_type'] === 'text/html') {
                             $parsedown = new Parsedown();
                             $body = $parsedown->text($body);
                         }
 
                         if ($params['template']) {
-                            $vars = array_merge($vars, ['content' => $body]);
-                            $body = $twig->processTemplate($params['template'], $vars);
+                            $body = $twig->processTemplate($params['template'], ['content' => $body] + $vars);
                         }
 
                         $content_type = !empty($params['content_type']) ? $twig->processString($params['content_type'], $vars) : null;
                         $charset = !empty($params['charset']) ? $twig->processString($params['charset'], $vars) : null;
 
                         $message->setBody($body, $content_type, $charset);
-                    }
-                    elseif (is_array($value)) {
+                    } elseif (is_array($value)) {
                         foreach ($value as $body_part) {
                             $body_part += [
                                 'charset' => $params['charset'],
@@ -213,8 +216,7 @@ public function buildMessage(array $params, array $vars = [])
                             }
 
                             if (isset($body_part['template'])) {
-                                $vars = array_merge($vars, ['content' => $body]);
-                                $body = $twig->processTemplate($body_part['template'], $vars);
+                                $body = $twig->processTemplate($body_part['template'], ['content' => $body] + $vars);
                             }
 
                             $content_type = !empty($body_part['content_type']) ? $twig->processString($body_part['content_type'], $vars) : null;