# HG changeset patch # User Marcin Kuzminski # Date 2016-09-30 14:19:12 # Node ID 5fa43f5fdaa762daab154c11551f22fd7e207646 # Parent c13e778500a696243f90edbb6c33655dcba2d933 ldap: fixed email extraction typo. An empty ldap email will now not overwritt the stored one. diff --git a/rhodecode/authentication/plugins/auth_ldap.py b/rhodecode/authentication/plugins/auth_ldap.py --- a/rhodecode/authentication/plugins/auth_ldap.py +++ b/rhodecode/authentication/plugins/auth_ldap.py @@ -444,7 +444,7 @@ class RhodeCodeAuthPlugin(RhodeCodeExter 'lastname': safe_unicode( get_ldap_attr('attr_lastname') or lastname), 'groups': groups, - 'email': get_ldap_attr('attr_email' or email), + 'email': get_ldap_attr('attr_email') or email, 'admin': admin, 'active': active, "active_from_extern": None,