Merge remote-tracking branch 'origin/develop' into develop

Author: cdujeu

core/src/plugins/auth.ldap/LdapAuthDriver.php

@@ -477,9 +477,7 @@ public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty =
         }
 
         if (!empty($this->hasGroupsMapping)) {
-            if ($baseGroup == "/") {
-                $this->dynamicFilter = "!(" . $this->hasGroupsMapping . "=*)";
-            } else {
+            if ($baseGroup !== "/") {
                 $this->dynamicFilter = $this->hasGroupsMapping . "=" . basename($baseGroup);
             }
         }
@@ -1100,4 +1098,4 @@ public function sanitize($s, $level = InputFilter::SANITIZE_HTML)
         $newS = preg_replace($preg, '_', $s);
         return $newS;
     }
-}
+}