Updated README to points to the wiki, git etc.

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 41a08363cc5bb1b3bbca51df6ac49a075afc7ff3..b558311d21c4df4019e5dde63679089c0ffa9567 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -298,7 +298,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
@@ -326,7 +326,7 @@ class UserController < ApplicationController
     @openID = params['openid']
        
     if !params['openid'].nil?
-         flash.now[:notice] = t 'user.new.openID association'
+      flash.now[:notice] = t 'user.new.openid association'
     end
   end