diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-11-29 17:26:49 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-11-29 17:26:49 +0100 |
| commit | 7b07ea0cbd2ceb901b2b6bca0f6a76714285cd22 (patch) | |
| tree | f23e2315b9068132b699372cd07389a438452270 /Core/User/LdapUserProvider.php | |
| parent | f48bdc7c4234c9adc53c348f6a73f3bbd65991ba (diff) | |
| parent | 713b72a42fc3a5d8bdc75dccda9959c7bb331486 (diff) | |
| download | symfony-security-7b07ea0cbd2ceb901b2b6bca0f6a76714285cd22.zip symfony-security-7b07ea0cbd2ceb901b2b6bca0f6a76714285cd22.tar.gz symfony-security-7b07ea0cbd2ceb901b2b6bca0f6a76714285cd22.tar.bz2 | |
Merge branch '2.8'
* 2.8:
[Bridge/Doctrine+Ldap] Fix tests
Marked the Ldap component as internal and removed Ldap constants polyfill
Conflicts:
src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
Diffstat (limited to 'Core/User/LdapUserProvider.php')
| -rw-r--r-- | Core/User/LdapUserProvider.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/User/LdapUserProvider.php b/Core/User/LdapUserProvider.php index ec699fc..988a595 100644 --- a/Core/User/LdapUserProvider.php +++ b/Core/User/LdapUserProvider.php @@ -57,7 +57,7 @@ class LdapUserProvider implements UserProviderInterface { try { $this->ldap->bind($this->searchDn, $this->searchPassword); - $username = $this->ldap->escape($username, '', LdapClientInterface::LDAP_ESCAPE_FILTER); + $username = $this->ldap->escape($username, '', LDAP_ESCAPE_FILTER); $query = str_replace('{username}', $username, $this->defaultSearch); $search = $this->ldap->find($this->baseDn, $query); } catch (ConnectionException $e) { |