From da9dc6f3ab6c1ae41ecfcf0712896448eedff0db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D?= Date: Sat, 20 Jul 2019 22:00:47 +0200 Subject: [PATCH] * [FIX] LDAP group filter wasn't applied when importing. Thanks to @twindscheif for the notice. Closes #1390 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rubén D --- app/modules/web/Controllers/ConfigLdapController.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/modules/web/Controllers/ConfigLdapController.php b/app/modules/web/Controllers/ConfigLdapController.php index 0a43f5b2..fe8a1194 100644 --- a/app/modules/web/Controllers/ConfigLdapController.php +++ b/app/modules/web/Controllers/ConfigLdapController.php @@ -267,10 +267,7 @@ final class ConfigLdapController extends SimpleControllerBase $userLdapService = $this->dic->get(LdapImportService::class); $userLdapService->importUsers($ldapParams, $ldapImportParams); - $filter = $this->request->analyzeString('ldap_import_filter'); - - // Groups won't be imported if filter is set - if ($checkImportGroups === true && empty($filter)) { + if ($checkImportGroups === true) { $userLdapService->importGroups($ldapParams, $ldapImportParams); }