Merge remote-tracking branch 'upstream/pull/3523'

[rails.git] / app / controllers / confirmations_controller.rb

diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb
index 372ac2a70c0dc2277902fc43f71d3bee25a94fdc..e54fa4a5db8de2bded6ae8d3de9d39255a748581 100644 (file)
--- a/app/controllers/confirmations_controller.rb
+++ b/app/controllers/confirmations_controller.rb
@@ -25,7 +25,7 @@ class ConfirmationsController < ApplicationController
         render_unknown_user token.user.display_name
       else
         user = token.user
         render_unknown_user token.user.display_name
       else
         user = token.user

-        user.status = "active"
+        user.activate

         user.email_valid = true
         flash[:notice] = gravatar_status_message(user) if gravatar_enable(user)
         user.save!
         user.email_valid = true
         flash[:notice] = gravatar_status_message(user) if gravatar_enable(user)
         user.save!


@@ -93,10 +93,10 @@ class ConfirmationsController < ApplicationController
         current_user.tokens.delete_all
         session[:user] = current_user.id
         session[:fingerprint] = current_user.fingerprint
         current_user.tokens.delete_all
         session[:user] = current_user.id
         session[:fingerprint] = current_user.fingerprint

-        redirect_to :controller => :users, :action => :account, :display_name => current_user.display_name
+        redirect_to edit_account_path

       elsif token
         flash[:error] = t "confirmations.confirm_email.failure"
       elsif token
         flash[:error] = t "confirmations.confirm_email.failure"

-        redirect_to :controller => :users, :action => :account, :display_name => token.user.display_name
+        redirect_to edit_account_path

       else
         flash[:error] = t "confirmations.confirm_email.unknown_token"
       end
       else
         flash[:error] = t "confirmations.confirm_email.unknown_token"
       end


@@ -129,9 +129,9 @@ class ConfirmationsController < ApplicationController
   # display a message about th current status of the gravatar setting
   def gravatar_status_message(user)
     if user.image_use_gravatar
   # display a message about th current status of the gravatar setting
   def gravatar_status_message(user)
     if user.image_use_gravatar

-      t "users.account.gravatar.enabled"
+      t "profiles.edit.gravatar.enabled"

     else
     else

-      t "users.account.gravatar.disabled"
+      t "profiles.edit.gravatar.disabled"

     end
   end
 end
     end
   end
 end