Mercurial > kallithea

diff rhodecode/model/user.py @ 1518:5585609772d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge beta fixes into stable
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 07 Oct 2011 17:54:21 +0200
parents bf263968da47 582686d76cb6
children 95c3e33ef32e
line wrap: on
line diff
--- a/rhodecode/model/user.py	Fri Oct 07 02:53:29 2011 +0200
+++ b/rhodecode/model/user.py	Fri Oct 07 17:54:21 2011 +0200
@@ -28,6 +28,7 @@
 
 from pylons.i18n.translation import _
 
+from rhodecode.lib import safe_unicode
 from rhodecode.model import BaseModel
 from rhodecode.model.caching_query import FromCache
 from rhodecode.model.db import User, RepoToPerm, Repository, Permission, \
@@ -111,7 +112,7 @@
                 new_user.api_key = generate_api_key(username)
                 new_user.email = attrs['email']
                 new_user.active = True
-                new_user.ldap_dn = user_dn
+                new_user.ldap_dn = safe_unicode(user_dn)
                 new_user.name = attrs['name']
                 new_user.lastname = attrs['lastname']