diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-08-23 11:43:32 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-08-23 11:43:32 -0400 |
| commit | 195664812220f17eb96788950ab8c35fce916962 (patch) | |
| tree | d976971e24932ec6e2d53604171d7ee7b9b9a0d7 /askbot/deps | |
| parent | 8e5df08f73c0cc29d2240604e5db418002aece07 (diff) | |
| parent | 7c67b7d0cc75b1ff2aebcc226ec04e01d7e103f7 (diff) | |
| download | askbot-195664812220f17eb96788950ab8c35fce916962.tar.gz askbot-195664812220f17eb96788950ab8c35fce916962.tar.bz2 askbot-195664812220f17eb96788950ab8c35fce916962.zip | |
Merge branch 'tag-editor' into user-groups
Diffstat (limited to 'askbot/deps')
| -rw-r--r-- | askbot/deps/django_authopenid/views.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/askbot/deps/django_authopenid/views.py b/askbot/deps/django_authopenid/views.py index a5dcee57..ba208b85 100644 --- a/askbot/deps/django_authopenid/views.py +++ b/askbot/deps/django_authopenid/views.py @@ -918,6 +918,10 @@ def register(request, login_provider_name=None, user_identifier=None): if 'ldap_user_info' in request.session: user_info = request.session['ldap_user_info'] + #we take this info from the user input where + #they can override the default provided by LDAP + user_info['ldap_username'] = username + user_info['email'] = email user = ldap_create_user(user_info).user del request.session['ldap_user_info'] login(request, user) |