From 79d27fe5678ec075b1129ad3b4b27f3cb040c1ca Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 22 Nov 2010 12:29:35 +0000
Subject: [PATCH] Updated class acl -Only merge ACLs if they exists, prevents
 PHP from merging NULL

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20318 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/include/class_acl.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc
index ab7d0e76b..413bd91f5 100644
--- a/gosa-core/include/class_acl.inc
+++ b/gosa-core/include/class_acl.inc
@@ -156,7 +156,9 @@ class acl extends plugin
     if (isset($this->parent) && $this->parent !== NULL){
         $oc= array();
         foreach ($this->parent->by_object as $key => $obj){
-            $oc= array_merge($oc, $obj->objectclasses);
+            if(isset($obj->objectclasses) && is_array($obj->objectclasses)){
+                $oc= array_merge($oc, $obj->objectclasses);
+            }
             if(isset($obj->acl_category)){
                 $tmp= str_replace("/","",$obj->acl_category);
                 $cats[$tmp] = $tmp;
-- 
2.30.2