X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_filter.inc;h=9b2fed5458381bcf79bba4e76752ac552e2b6042;hb=ae725dfb9dbf8a8765de0c3854329b2e9edf3512;hp=286725978de42d16a0ae507d2dd0f39f7e2a7513;hpb=099fb791bb6d2c03127ac3d547d1540a456218e1;p=gosa.git diff --git a/gosa-core/include/class_filter.inc b/gosa-core/include/class_filter.inc index 286725978..9b2fed545 100644 --- a/gosa-core/include/class_filter.inc +++ b/gosa-core/include/class_filter.inc @@ -383,9 +383,6 @@ class filter { $filter= $query['filter']; $attributes= $query['attribute']; - $method = ""; - if(isset($query['method'])) $method = $query['method']; - // Generate final filter foreach ($this->elements as $tag => $element) { if (!isset($element['set']) || !isset($element['unset'])) { @@ -411,8 +408,7 @@ class filter { } } - $result= array_merge($result, call_user_func(array($backend, 'query'), $this->base, $this->scope, $filter, $attributes, $this->category,$method, $this->objectStorage)); - $result = call_user_func(array($backend, 'unifyResults'), $result); + $result= array_merge($result, call_user_func(array($backend, 'query'), $this->base, $this->scope, $filter, $attributes, $this->category, $this->objectStorage)); } return ($result);