From 357f9298bdb595f67b1f89292be9fa4268e1bffd Mon Sep 17 00:00:00 2001 From: ThibG Date: Mon, 19 Mar 2018 20:07:47 +0100 Subject: 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 --- app/views/user_mailer/email_changed.text.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/user_mailer/email_changed.text.erb') diff --git a/app/views/user_mailer/email_changed.text.erb b/app/views/user_mailer/email_changed.text.erb index 2b58415f5..345b16a2c 100644 --- 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' %> -- cgit