From fbe2f7ab4c586d4fd99f93a7b746a35585672b97 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 8 Jun 2018 17:52:59 +1000 Subject: [PATCH] Remove unused variable from mailer The second variable passed by Devise is actually a hash, not a token. --- app/mailers/spree/user_mailer_decorator.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/mailers/spree/user_mailer_decorator.rb b/app/mailers/spree/user_mailer_decorator.rb index 991db0074c..778f4d421a 100644 --- a/app/mailers/spree/user_mailer_decorator.rb +++ b/app/mailers/spree/user_mailer_decorator.rb @@ -5,9 +5,10 @@ Spree::UserMailer.class_eval do :subject => t(:welcome_to) + Spree::Config[:site_name]) end - def confirmation_instructions(user, token) + # Overriding `Spree::UserMailer.confirmation_instructions` which is + # overriding `Devise::Mailer.confirmation_instructions`. + def confirmation_instructions(user, _opts) @user = user - @token = token subject = t('spree.user_mailer.confirmation_instructions.subject') mail(to: user.email, from: from_address,