Don't override filter or base DN

refs #2997
2017-10-09 11:23:58 +02:00 · 2017-10-09 11:23:58 +02:00 · c259fe6e50
parent a171a14399
commit c259fe6e50
1 changed files with 6 additions and 2 deletions
--- a/application/forms/Config/UserBackend/LdapBackendForm.php
+++ b/application/forms/Config/UserBackend/LdapBackendForm.php
@ -281,10 +281,14 @@ class LdapBackendForm extends Form
            }

            $formData['user_class'] = $userClass;
+
+            if (! isset($formData['filter']) || $formData['filter'] === '') {
                $formData['filter'] = $filter;
+            }
+
            $formData['user_name_attribute'] = $userNameAttribute;

-            if ($baseDn !== null) {
+            if ($baseDn !== null && (! isset($formData['base_dn']) || $formData['base_dn'] === '')) {
                $formData['base_dn'] = $baseDn;
            }
        }