projects
/
rails.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c940313
)
Don't error if we fail to get SReg and/or AX data from OpenID
author
Tom Hughes
<tom@compton.nu>
Tue, 14 Jun 2011 23:07:32 +0000
(
00:07
+0100)
committer
Tom Hughes
<tom@compton.nu>
Tue, 14 Jun 2011 23:07:32 +0000
(
00:07
+0100)
app/controllers/user_controller.rb
patch
|
blob
|
history
diff --git
a/app/controllers/user_controller.rb
b/app/controllers/user_controller.rb
index d380e4c7bc211eb7b3ebd2e7f8f6323007f456d5..b337dc04c6cd8fd50014344c8ec4ae5fdb1b3a73 100644
(file)
--- a/
app/controllers/user_controller.rb
+++ b/
app/controllers/user_controller.rb
@@
-539,6
+539,10
@@
private
failed_login t('user.login.auth failure')
end
else
failed_login t('user.login.auth failure')
end
else
+ # Guard against not getting any extension data
+ sreg = Hash.new if sreg.nil?
+ ax = Hash.new if ax.nil?
+
# We don't have a user registered to this OpenID, so redirect
# to the create account page with username and email filled
# in if they have been given by the OpenID provider through
# We don't have a user registered to this OpenID, so redirect
# to the create account page with username and email filled
# in if they have been given by the OpenID provider through