Code

Fixed acl handling in lists.n -Acls were not checked correctl. If we had permissions...
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 8 Mar 2010 08:07:25 +0000 (08:07 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 8 Mar 2010 08:07:25 +0000 (08:07 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@16322 594d385d-05f5-0310-b6e9-bd551577e9d8

gosa-core/include/class_filter.inc

index f44e39dcb5ec03c9cead94245d24390b19123e8b..cd9aa8dd7294a6956ba027dcda8b05726587ea7c 100644 (file)
@@ -37,6 +37,7 @@ class filter {
   var $alphabet= null;
   var $converter= array();
   var $pid;
+  var $headpage;
 
 
   function filter($filename)
@@ -419,7 +420,9 @@ class filter {
         }
       }
 
-      $result= array_merge($result, call_user_func(array($backend, 'query'), $this->base, $this->scope, $filter, $attributes, $this->category, $this->objectStorage));
+      // Now call filter method and merge resulting entries. 
+      $result= array_merge($result, call_user_func(array($backend, 'query'),
+            $this, $this->base, $this->scope, $filter, $attributes, $this->category, $this->objectStorage));
     }
     
     return ($result);