resolved conflict

netoctone · Jun 20, 2012 · b4b1e18 · b4b1e18
2 parents 82a33bc + be65b22
commit b4b1e18
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/sorcery/controller/submodules/external.rb b/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