From: Matías Aguirre <matiasaguirre@gmail.com>
Date: Tue, 21 Jun 2011 03:51:51 +0000 (-0300)
Subject: Merge remote-tracking branch 'fcurella/patch-1'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5ce9cde251dbc94fd47a59688ab17ee7e46925d5;p=django-social-auth.git

Merge remote-tracking branch 'fcurella/patch-1'

Conflicts:
	social_auth/views.py
---

5ce9cde251dbc94fd47a59688ab17ee7e46925d5
diff --cc social_auth/views.py
index 4ba2b83,dede174..c741fd3
--- a/social_auth/views.py
+++ b/social_auth/views.py
@@@ -52,14 -48,15 +52,14 @@@ def complete_process(request, backend)
  
      if user and getattr(user, 'is_active', True):
          login(request, user)
++        # user.social_user is the used UserSocialAuth instance defined
++        # in authenticate process
+         social_user = user.social_user
+ 
 -        if getattr(settings, 'SOCIAL_AUTH_SESSION_EXPIRATION', True):
 +        if SESSION_EXPIRATION :
              # Set session expiration date if present and not disabled by
              # setting. Use last social-auth instance for current provider,
              # users can associate several accounts with a same provider.
--            #
--            # user.social_user is the used UserSocialAuth instance defined
--            # in authenticate process
-             social_user = user.social_user
              if social_user.expiration_delta():
                  request.session.set_expiry(social_user.expiration_delta())