Permalink
Browse files

Merge pull request #633 from serdardalgic/return_value_fix_for_pipeli…

…ne_social_associate_user_function

Return value fix for pipeline social associate user function
  • Loading branch information...
2 parents 50eb0f5 + c901623 commit 5da548e7e146b55d9bd3fab2c46c064575e9c25e @omab committed Mar 14, 2013
Showing with 1 addition and 4 deletions.
  1. +1 −4 social_auth/backends/pipeline/social.py
@@ -27,12 +27,9 @@ def social_auth_user(backend, uid, user=None, *args, **kwargs):
def associate_user(backend, user, uid, social_user=None, *args, **kwargs):
"""Associate user social account with user instance."""
- if social_user:
+ if social_user or not user:
return None
- if not user:
- return {}
-
try:
social = UserSocialAuth.create_social_auth(user, uid, backend.name)
except Exception, e:

0 comments on commit 5da548e

Please sign in to comment.