Permalink
Browse files

resolved conflict

  • Loading branch information...
NoamB committed Jun 20, 2012
2 parents 82a33bc + be65b22 commit b4b1e18433cf1382fdfa5a05e9878b03d0c1b59d
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/sorcery/controller/submodules/external.rb
@@ -76,7 +76,7 @@ def add_provider_to_user(provider)
user_hash = provider.get_user_hash
config = user_class.sorcery_config
- user = current_user.send(config.authentications_class.to_s.downcase.pluralize).build(config.provider_uid_attribute_name => user_hash[:uid], config.provider_attribute_name => provider_name)
+ user = current_user.send(config.authentications_class.to_s.downcase.pluralize).build(config.provider_uid_attribute_name => user_hash[:uid], config.provider_attribute_name => provider_name.to_s)
user.save(:validate => false)
return user

0 comments on commit b4b1e18

Please sign in to comment.