]> git.parisson.com Git - django-social-auth.git/commitdiff
Fix email association if clause. Closes gh-51.
authorMatías Aguirre <matiasaguirre@gmail.com>
Thu, 14 Apr 2011 13:07:58 +0000 (10:07 -0300)
committerMatías Aguirre <matiasaguirre@gmail.com>
Thu, 14 Apr 2011 13:07:58 +0000 (10:07 -0300)
social_auth/backends/__init__.py

index 8e867c83a8e4ec7c68388cff1649a4f47bb86cb8..53256605f2b62a4ac8a39b84de52aafc8bbc428a 100644 (file)
@@ -115,7 +115,10 @@ class SocialAuthBackend(ModelBackend):
                     return None
 
                 email = details.get('email')
-                if ASSOCIATE_BY_MAIL:
+                if email and ASSOCIATE_BY_MAIL:
+                    # try to associate accounts registered with the same email
+                    # address, only if it's a single object. ValueError is
+                    # raised if multiple objects are returned
                     try:
                         user = User.objects.get(email=email)
                     except MultipleObjectsReturned: