From 6ea6b78fd4b873c33e37b4c62ea26bd2189b7c21 Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Wed, 29 Apr 2020 15:31:30 +0200 Subject: [PATCH] LSsearch : fix possibility to specify a filter and a pattern (in the same time) --- public_html/includes/class/class.LSsearch.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/public_html/includes/class/class.LSsearch.php b/public_html/includes/class/class.LSsearch.php index 879d6cdc..7b117dc6 100644 --- a/public_html/includes/class/class.LSsearch.php +++ b/public_html/includes/class/class.LSsearch.php @@ -275,22 +275,18 @@ class LSsearch { $OK=false; } } - + // Patterm if (isset($params['pattern'])) { if ($params['pattern']=="") { $this -> params['pattern'] = NULL; - $this -> params['filter'] = NULL; } elseif ($this -> isValidPattern($params['pattern'])) { $this -> params['pattern'] = $params['pattern']; - if (!is_string($params['filter'])) { - $this -> params['filter']=NULL; - } } } - - + + // BaseDN if (isset($params['basedn']) && is_string($params['basedn'])) { if (isCompatibleDNs(LSsession :: getRootDn(),$params['basedn'])) {