From: Matías Aguirre <matiasaguirre@gmail.com>
Date: Mon, 9 Jul 2012 05:39:43 +0000 (-0700)
Subject: Merge pull request #384 from niftynei/master
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cf605fb90d9e7ac607238cb4ccc4f354959e47cf;p=django-social-auth.git

Merge pull request #384 from niftynei/master

Adds convenience querystring for login redirects
---

cf605fb90d9e7ac607238cb4ccc4f354959e47cf
diff --cc social_auth/context_processors.py
index 129c5b8,f4e194b..6a44423
--- a/social_auth/context_processors.py
+++ b/social_auth/context_processors.py
@@@ -1,7 -1,9 +1,9 @@@
 +from social_auth.models import UserSocialAuth
  from social_auth.backends import get_backends
  from social_auth.utils import group_backend_by_type
 -from social_auth.models import User
  
+ from django.contrib.auth import REDIRECT_FIELD_NAME as auth_redirect
+ from django.conf import settings
  
  # Note: social_auth_backends, social_auth_by_type_backends and
  #       social_auth_by_name_backends don't play nice together.