Skip to content
Snippets Groups Projects
Commit c156a83e authored by abcang's avatar abcang Committed by Eugen Rochko
Browse files

Make sure status is not nil (#6428)

parent 258dcb84
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/mailers/notification_mailer.rb
+ 3
− 3
View file @ c156a83e
......@@ -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)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment