[MERGE] forward port of branch 7.0 up to 152d9de

addons/auth_ldap/users_ldap.py

@@ -96,7 +96,11 @@ class CompanyLDAP(osv.osv):
             return False
 
         entry = False
-        filter = filter_format(conf['ldap_filter'], (login,))
+        try:
+            filter = filter_format(conf['ldap_filter'], (login,))
+        except TypeError:
+            _logger.warning('Could not format LDAP filter. Your filter should contain one \'%s\'.')
+            return False
         try:
             results = self.query(conf, filter)