Merge branch 'release/3.0.1'

getgrav · Apr 15, 2019 · eda7415 · eda7415
2 parents 98bb17d + fed09bb
commit eda7415
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v3.0.1
+## 04/15/2019
+
+1. [](#improved)
+    * Put a `try/catch` around email attachments and log any errors rather than hard fail
+1. [](#bugfix)
+    * Fixed missing attachments when sending an email using a form [form#333](https://github.com/getgrav/grav-plugin-form/issues/333)
+
 # v3.0.0
 ## 04/11/2019
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Email
-version: 3.0.0
+version: 3.0.1
 testing: false
 description: Enables the emailing system for Grav
 icon: envelope

diff --git a/email.php b/email.php
@@ -71,6 +71,10 @@ public function onFormProcessed(Event $event)
                     'form' => $form
                 );
 
+                // Copy files now, we need those.
+                // TODO: we need a better solution. Maybe we can use streams for the attachments?
+                $form->copyFiles();
+
                 $grav = Grav::instance();
                 $grav->fireEvent('onEmailSend', new Event(['params' => &$params, 'vars' => &$vars]));
 
@@ -89,7 +93,12 @@ public function onFormProcessed(Event $event)
                                 $filename = ROOT_DIR . $fileValues['path'];
                             }
 
-                            $message->attach(\Swift_Attachment::fromPath($filename));
+                            try {
+                                $message->attach(\Swift_Attachment::fromPath($filename));
+                            } catch (\Exception $e) {
+                                // Log any issues
+                                $grav['log']->error($e->getMessage());
+                            }
                         }
                     }
                 }