Fixed: Deprecated ActionMailer API

smidig · Apr 26, 2011 · d562832 · d562832
1 parent 1d1d580
commit d562832
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/password_resets_controller.rb b/app/controllers/password_resets_controller.rb
@@ -10,7 +10,7 @@ def new
   def create
     @user = User.find_by_email(params[:email])
     if @user
-      @user.deliver_password_reset_instructions!
+      @user.password_reset_instructions!.deliver
       flash[:notice] = "Vi har sendt instruksjoner for å endre passord til den angitte emailadressen. Følg instruksjonene for å endre passordet."
       redirect_to root_url
     else

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -47,9 +47,9 @@ def user_status
     registration ? registration.description : "Ukjent"
   end
 
-  def deliver_password_reset_instructions!
+  def password_reset_instructions
     reset_perishable_token!
-    SmidigMailer.password_reset_instructions(self).deliver
+    SmidigMailer.password_reset_instructions(self)
   end