Skip to content

Commit

Permalink
Fixed deprecation warnings from old mailer API. Closes refineryGH-157.
Browse files Browse the repository at this point in the history
  • Loading branch information
Steven Heidel committed Aug 26, 2010
1 parent bef87db commit 743187c
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
22 changes: 22 additions & 0 deletions vendor/refinerycms/authentication/app/mailers/user_mailer.rb
@@ -0,0 +1,22 @@
class UserMailer < ActionMailer::Base

def reset_notification(user, request)
setup_email(user)
subject I18n.translate('user_mailer.link_to_reset_your_password')
@url = reset_users_url(:host => request.host_with_port,
:reset_code => user.perishable_token)
end

protected

def url_prefix(request)
"#{request.protocol}#{request.host_with_port}"
end

def setup_email(user)
recipients user.email
sent_on Time.now
@user = user
end

end
2 changes: 1 addition & 1 deletion vendor/refinerycms/authentication/app/models/user.rb
Expand Up @@ -28,7 +28,7 @@ def self.find_by_login_or_email(login_or_email)

def deliver_password_reset_instructions!(request)
reset_perishable_token!
UserMailer.deliver_reset_notification(self, request)
UserMailer.reset_notification(self, request).deliver
end

#-------------------------------------------------------------------------------------------------
Expand Down
22 changes: 0 additions & 22 deletions vendor/refinerycms/authentication/app/models/user_mailer.rb

This file was deleted.

0 comments on commit 743187c

Please sign in to comment.