diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-27 17:30:42 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-27 18:09:28 +0200 |
| commit | 53b7bb9d047cfc8b21ee0540bd3e5285267160fd (patch) | |
| tree | 30dcf8694eadb68ca8a9579e312f9c38ad8c09d1 /app/mailers | |
| parent | af934b90710a2ce1099d3ceda5de7bcf0e94595c (diff) | |
| parent | 81697997a3fdbb481202a179908958198baaf0dd (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/user_mailer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 9848c34a2..aa76b4dfe 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -16,7 +16,7 @@ class UserMailer < Devise::Mailer return if @resource.disabled? I18n.with_locale(@resource.locale || I18n.default_locale) do - mail to: @resource.unconfirmed_email.blank? ? @resource.email : @resource.unconfirmed_email, + mail to: @resource.unconfirmed_email.presence || @resource.email, subject: I18n.t(@resource.pending_reconfirmation? ? 'devise.mailer.reconfirmation_instructions.subject' : 'devise.mailer.confirmation_instructions.subject', instance: @instance), template_name: @resource.pending_reconfirmation? ? 'reconfirmation_instructions' : 'confirmation_instructions' end |