diff --git a/src/app/controllers/password_resets_controller.rb b/src/app/controllers/password_resets_controller.rb index f38960182d0..e12a701c0b1 100644 --- a/src/app/controllers/password_resets_controller.rb +++ b/src/app/controllers/password_resets_controller.rb @@ -75,9 +75,7 @@ def find_user_by_user_and_email begin @user = User.find_by_username_and_email!(params[:username], params[:email]) rescue Exception => error - errors error.to_s, {:persist => false} - redirect_to root_url - execute_after_filters + Rails.logger.error error.to_s end end @@ -85,9 +83,7 @@ def find_users_by_email begin @users = User.where(:email => params[:email]) rescue Exception => error - errors error.to_s, {:persist => false} - redirect_to root_url - execute_after_filters + Rails.logger.error error.to_s end end diff --git a/src/app/views/user_mailer/logins.text.haml b/src/app/views/user_mailer/logins.text.haml index b5d79aff834..a6fab34eeb6 100644 --- a/src/app/views/user_mailer/logins.text.haml +++ b/src/app/views/user_mailer/logins.text.haml @@ -1,6 +1,5 @@ -#{_("A request has been received to retrieve the Katello logins for email '%s'. The following is a list of those logins:") % @email} +#{_("A request has been received by Katello server '%{s}' to retrieve the logins for email '%{e}'. The following is a list of those logins:" % {:s => root_url, :e => @email})} - @users.each do |user| = user.username -