Ingore first listing if configured this way. Just load list once...

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14135 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/include/class_filter.inc b/gosa-core/include/class_filter.inc
index 4d8260fc457e7b37938a64a68fa968b1dd79ad78..1a058950aae1775c2f796ce939f42cbf61f99e31 100644 (file)
--- a/gosa-core/include/class_filter.inc
+++ b/gosa-core/include/class_filter.inc
@@ -353,6 +353,12 @@ class filter {
     global $class_mapping;
     $result= array();
 
+    // Return empty list if initial is not set
+    if (!$this->initial) {
+      $this->initial= true;
+      return $result;
+    }
+
     // Go thru all queries and merge results
     foreach ($this->query as $query) {
       if (!isset($query['backend']) || !isset($query['filter']) || !isset($query['attribute'])) {

diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index 4fdc6e2cc88fd12ea7e5b3c8a5c0ffd608e6996c..65f039181d9aabf94a95e3322292573167227438 100644 (file)
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -110,7 +110,6 @@ class listing {
       $this->departments= $this->getDepartments();
     }
     $this->filter->setBase($this->base);
-    $this->entries= $this->filter->query();
   }