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

pydio · Nov 18, 2016 · daa8e54 · daa8e54
2 parents 08ba517 + 8290d69
commit daa8e54
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/core/src/plugins/auth.ldap/LdapAuthDriver.php b/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;
     }
-}
+}