diff options
author | blizzz <blizzz@owncloud.com> | 2015-07-16 11:35:25 +0200 |
---|---|---|
committer | blizzz <blizzz@owncloud.com> | 2015-07-16 11:35:25 +0200 |
commit | bfb90d10edfc863213522c704f7d0b8bad8c8646 (patch) | |
tree | c5db88dab3beb85fb320d7249b8f436dd5f20e14 /apps/user_ldap/lib/access.php | |
parent | dce462c28db1d5e5b144efcfb26a466bd290621c (diff) | |
parent | 472d48f6e32168bb7309a4869e469eb305d95f14 (diff) | |
download | nextcloud-server-bfb90d10edfc863213522c704f7d0b8bad8c8646.tar.gz nextcloud-server-bfb90d10edfc863213522c704f7d0b8bad8c8646.zip |
Merge pull request #17046 from nicolas-grekas/fix-16654
Do not use OC*::mb_*_replace(), they are useless
Diffstat (limited to 'apps/user_ldap/lib/access.php')
-rw-r--r-- | apps/user_ldap/lib/access.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index b201220d725..89d966772ee 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -632,8 +632,7 @@ class Access extends LDAPUtility implements user\IUserTools { */ public function fetchUsersByLoginName($loginName, $attributes = array('dn')) { $loginName = $this->escapeFilterPart($loginName); - $filter = \OCP\Util::mb_str_replace( - '%uid', $loginName, $this->connection->ldapLoginFilter, 'UTF-8'); + $filter = str_replace('%uid', $loginName, $this->connection->ldapLoginFilter); $users = $this->fetchListOfUsers($filter, $attributes); return $users; } @@ -1012,7 +1011,7 @@ class Access extends LDAPUtility implements user\IUserTools { $name = iconv('UTF-8', 'ASCII//TRANSLIT', $name); // Replacements - $name = \OCP\Util::mb_str_replace(' ', '_', $name, 'UTF-8'); + $name = str_replace(' ', '_', $name); // Every remaining disallowed characters will be removed $name = preg_replace('/[^a-zA-Z0-9_.@-]/u', '', $name); |