diff options
| author | abcang <abcang1015@gmail.com> | 2018-02-04 20:31:46 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-02-04 12:31:46 +0100 |
| commit | c156a83e7d4458355e7ab60ee118ca8c09b80ece (patch) | |
| tree | 2d9bd61067f6baaf5222596572f2756ea144920f /app/mailers | |
| parent | 258dcb849f2146069a2b2914cea3a28619f55c90 (diff) | |
Make sure status is not nil (#6428)
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/notification_mailer.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb index 9fed4a636..b45844296 100644 --- a/app/mailers/notification_mailer.rb +++ b/app/mailers/notification_mailer.rb @@ -9,7 +9,7 @@ class NotificationMailer < ApplicationMailer @me = recipient @status = notification.target_status - return if @me.user.disabled? + return if @me.user.disabled? || @status.nil? locale_for_account(@me) do thread_by_conversation(@status.conversation) @@ -33,7 +33,7 @@ class NotificationMailer < ApplicationMailer @account = notification.from_account @status = notification.target_status - return if @me.user.disabled? + return if @me.user.disabled? || @status.nil? locale_for_account(@me) do thread_by_conversation(@status.conversation) @@ -46,7 +46,7 @@ class NotificationMailer < ApplicationMailer @account = notification.from_account @status = notification.target_status - return if @me.user.disabled? + return if @me.user.disabled? || @status.nil? locale_for_account(@me) do thread_by_conversation(@status.conversation) |