summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-09-30 15:35:57 +0200
committerChristophe Simonis <chs@odoo.com>2016-09-30 15:35:57 +0200
commiteb4f0309a9cdd609c4313de1ef320b4542bcf484 (patch)
treef35db12161415e1e91ebd0d14747c6c721d34628 /addons
parent858a8b9ef15bd7a5fc0e08f28705088cbe4d98ca (diff)
parent295f62741d8d416c7ce3f0af0825d5e80766ac9c (diff)
[MERGE] forward port branch 8.0 up to 295f627
Diffstat (limited to 'addons')
-rw-r--r--addons/auth_ldap/users_ldap.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/auth_ldap/users_ldap.py b/addons/auth_ldap/users_ldap.py
index 4c917cc6729..a0751df0697 100644
--- a/addons/auth_ldap/users_ldap.py
+++ b/addons/auth_ldap/users_ldap.py
@@ -102,7 +102,7 @@ class CompanyLDAP(osv.osv):
_logger.warning('Could not format LDAP filter. Your filter should contain one \'%s\'.')
return False
try:
- results = self.query(conf, filter)
+ results = self.query(conf, filter.encode('utf-8'))
# Get rid of (None, attrs) for searchResultReference replies
results = [i for i in results if i[0]]