diff options
| author | hrcerqueira <hrcerqueira@gmail.com> | 2010-03-03 16:07:37 +0000 |
|---|---|---|
| committer | hrcerqueira <hrcerqueira@gmail.com> | 2010-03-03 16:07:37 +0000 |
| commit | a8d8970782bdeafb35b2b8291a29c5764e111560 (patch) | |
| tree | 6520febe5686c5b58870f642a55fa4ab380ed193 /forum | |
| parent | ec71d0c85766da2f9c369d2dc92c83d2a25cd22d (diff) | |
| parent | 94830a7ed9014fca3b1f29c8c02261aec280fa7c (diff) | |
| download | askbot-a8d8970782bdeafb35b2b8291a29c5764e111560.tar.gz askbot-a8d8970782bdeafb35b2b8291a29c5764e111560.tar.bz2 askbot-a8d8970782bdeafb35b2b8291a29c5764e111560.zip | |
Merge branch 'master' of github.com:rickross/osqa
Conflicts:
forum/views/auth.py
Diffstat (limited to 'forum')
| -rw-r--r--[-rwxr-xr-x] | forum/views/auth.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/forum/views/auth.py b/forum/views/auth.py index 20e208ae..74f7af4b 100755..100644 --- a/forum/views/auth.py +++ b/forum/views/auth.py @@ -115,7 +115,7 @@ def process_provider_signin(request, provider): return HttpResponseRedirect(reverse('auth_signin')) else: if isinstance(assoc_key, (type, User)): - return login_and_forward(request, assoc_key) + return login_and_forward(request, assoc_key) try: assoc = AuthKeyUserAssociation.objects.get(key=assoc_key) |