Merge branch 'master' into terms
[rails.git] / app / controllers / user_controller.rb
index 8fdb89b227c628c78807a87535d42c5f961edb6e..1bab42266e08bf3f47cb91db9afade9362c4cc81 100644 (file)
@@ -148,7 +148,7 @@ class UserController < ApplicationController
         if params[:user]
           @user.pass_crypt = params[:user][:pass_crypt]
           @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
-          @user.status = "active"
+          @user.status = "active" if @user.status == "pending"
           @user.email_valid = true
 
           if @user.save