From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 26 Aug 2009 07:00:38 +0000 (+0000)
Subject: Ingore first listing if configured this way. Just load list once...
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8f48faa8174c032861a0fa770409e0d65c307fee;p=gosa.git

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 4d8260fc4..1a058950a 100644
--- 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 4fdc6e2cc..65f039181 100644
--- 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();
   }