Mercurial > hg > soundsoftware-site
diff app/controllers/account_controller.rb @ 60:cf39b52d24b4 luisf
DEVELOPMENT COMMIT: The description can now be seen and edited BUT when a new user registers the informations is not saved to the correct table.
author | luisf |
---|---|
date | Wed, 01 Dec 2010 18:04:19 +0000 |
parents | 7ff14a13f48a |
children | 39db1b84d09f |
line wrap: on
line diff
--- a/app/controllers/account_controller.rb Wed Dec 01 00:21:03 2010 +0000 +++ b/app/controllers/account_controller.rb Wed Dec 01 18:04:19 2010 +0000 @@ -77,18 +77,17 @@ # User self-registration def register redirect_to(home_url) && return unless Setting.self_registration? || session[:auth_source_registration] + if request.get? session[:auth_source_registration] = nil @user = User.new(:language => Setting.default_language) + else @user = User.new(params[:user]) @user.admin = false + + @user.register - - @user.description = params[:description] - - - @user.register if session[:auth_source_registration] @user.activate @user.login = session[:auth_source_registration][:login]