From 95860dfc55dce298227e86d499e6f24b6fe46c34 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Sun, 11 Dec 2016 17:24:23 -0500 Subject: [PATCH] handle nil mailers --- .../notification_mailer/new_notification_email.html.erb | 6 ++++-- .../notification_mailer/new_notification_email.text.erb | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/views/mailboxer/notification_mailer/new_notification_email.html.erb b/app/views/mailboxer/notification_mailer/new_notification_email.html.erb index d8fda23c..87d8da33 100644 --- a/app/views/mailboxer/notification_mailer/new_notification_email.html.erb +++ b/app/views/mailboxer/notification_mailer/new_notification_email.html.erb @@ -1,4 +1,6 @@ <% mail = ApplicationMailer.mail_for_notification(@notification) %> -<% @notification.update(body: mail.html_part&.body&.decoded) %> -<%= raw mail.html_part&.body&.decoded %> +<% if mail %> + <% @notification.update(body: mail.html_part&.body&.decoded) %> + <%= raw mail.html_part&.body&.decoded %> +<% end %> diff --git a/app/views/mailboxer/notification_mailer/new_notification_email.text.erb b/app/views/mailboxer/notification_mailer/new_notification_email.text.erb index 45fa8ae0..58623b16 100644 --- a/app/views/mailboxer/notification_mailer/new_notification_email.text.erb +++ b/app/views/mailboxer/notification_mailer/new_notification_email.text.erb @@ -1,2 +1,4 @@ <% mail = ApplicationMailer.mail_for_notification(@notification) %> -<%= mail.text_part&.body&.decoded %> +<% if mail %> + <%= mail.text_part&.body&.decoded %> +<% end %>