projects
/
rails.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0199883
)
Make password signups work
author
Tom Hughes
<tom@compton.nu>
Fri, 10 Jun 2011 20:48:17 +0000
(21:48 +0100)
committer
Tom Hughes
<tom@compton.nu>
Fri, 10 Jun 2011 20:48:17 +0000
(21:48 +0100)
app/controllers/user_controller.rb
patch
|
blob
|
history
diff --git
a/app/controllers/user_controller.rb
b/app/controllers/user_controller.rb
index 9e2961df2716fa95696d1efabf92cf5ec57c04ea..fe5afd9609c9cf5242cd45b6c33886030cb23e50 100644
(file)
--- a/
app/controllers/user_controller.rb
+++ b/
app/controllers/user_controller.rb
@@
-67,7
+67,7
@@
class UserController < ApplicationController
elsif @user.terms_agreed?
# Already agreed to terms, so just show settings
redirect_to :action => :account, :display_name => @user.display_name
elsif @user.terms_agreed?
# Already agreed to terms, so just show settings
redirect_to :action => :account, :display_name => @user.display_name
- elsif params[:user] and
params[:user][:openid_url]
+ elsif params[:user] and
not params[:user][:openid_url].empty?
# Verify OpenID before moving on
session[:new_user] = @user
openid_verify(params[:user][:openid_url], @user)
# Verify OpenID before moving on
session[:new_user] = @user
openid_verify(params[:user][:openid_url], @user)
@@
-125,6
+125,7
@@
class UserController < ApplicationController
@user.languages = request.user_preferred_languages
@user.terms_agreed = Time.now.getutc
@user.terms_seen = true
@user.languages = request.user_preferred_languages
@user.terms_agreed = Time.now.getutc
@user.terms_seen = true
+ @user.openid_url = nil if @user.openid_url.empty?
if @user.save
flash[:notice] = t 'user.new.flash create success message', :email => @user.email
if @user.save
flash[:notice] = t 'user.new.flash create success message', :email => @user.email