Fix e-mail changed notification (fixes #6778) (#6835)

In Devise::Mailer#email_changed, the new email might be in the email attr. See: https://github.com/plataformatec/devise/blob/master/app/views/devise/mailer/email_changed.html.erb
2018-03-19 20:07:47 +01:00
parent f7c46fc113
commit 357f9298bd
2 changed files with 2 additions and 2 deletions
--- a/app/views/user_mailer/email_changed.text.erb
+++ b/app/views/user_mailer/email_changed.text.erb
@ -4,6 +4,6 @@

 <%= t 'devise.mailer.email_changed.explanation' %>

-<%= @resource.unconfirmed_email %>
+<%= @resource.try(:unconfirmed_email) ? @resource.unconfirmed_email : @resource.email %>

 <%= t 'devise.mailer.email_changed.extra' %>