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

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

diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb
index bcb4c1617d25ca3a6ac8df8d6ac8b2b2836b8653..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!