diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2013-10-23 12:01:45 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2013-10-23 12:01:45 +0200 |
| commit | d78a80a6892bdf47388329d7d426ccab6a36cf20 (patch) | |
| tree | d993a6fecb3277f86d457e0a952aeb2dc5f9590f /apps/user_ldap/lib | |
| parent | 76a195a0be5d36c090c05ce60e02466e9783fea3 (diff) | |
| parent | 2d14daf36bf6c808e55895c78b42144942b73246 (diff) | |
| download | nextcloud-server-d78a80a6892bdf47388329d7d426ccab6a36cf20.tar.gz nextcloud-server-d78a80a6892bdf47388329d7d426ccab6a36cf20.zip | |
merge master with resolved conflicts
Diffstat (limited to 'apps/user_ldap/lib')
| -rw-r--r-- | apps/user_ldap/lib/access.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 6177693c489..0d4b09bac7e 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -1021,7 +1021,7 @@ class Access extends LDAPUtility { $bases = $this->sanitizeDN($bases); foreach($bases as $base) { $belongsToBase = true; - if(mb_strripos($dn, $base, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($base))) { + if(mb_strripos($dn, $base, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($base, 'UTF-8'))) { $belongsToBase = false; } if($belongsToBase) { |