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

Fix confirmation email being sent to old address when changing it

parent de9b6e3a
No related branches found
No related tags found
No related merge requests found
......@@ -22,6 +22,7 @@ const en = {
"account.follows": "Follows",
"account.followers": "Followers",
"account.follows_you": "Follows you",
"account.requested": "Awaiting approval",
"getting_started.heading": "Getting started",
"getting_started.about_addressing": "You can follow people if you know their username and the domain they are on by entering an e-mail-esque address into the search form.",
"getting_started.about_shortcuts": "If the target user is on the same domain as you, just the username will work. The same rule applies to mentioning people in statuses.",
......
......@@ -9,7 +9,7 @@ class UserMailer < Devise::Mailer
@token = token
I18n.with_locale(@resource.locale || I18n.default_locale) do
mail to: @resource.email
mail to: @resource.unconfirmed_email.blank? ? @resource.email : @resource.unconfirmed_email
end
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment