From 5138e8cb1cdba00b223d1fa1c82b85e469d32214 Mon Sep 17 00:00:00 2001 From: psc Date: Tue, 7 Sep 2010 12:48:09 +0000 Subject: [PATCH] Followup patch for #3305 Remove properties of object groups once the last member has been removed and the object group is saved. This fixes a problem when removing of empty object groups was hitting an ldap error if sub objects were still present. git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@19551 594d385d-05f5-0310-b6e9-bd551577e9d8 --- trunk/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/trunk/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc b/trunk/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc index 3794fc6e2..f5b777db6 100644 --- a/trunk/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc +++ b/trunk/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc @@ -380,11 +380,8 @@ class ogrouptabs extends tabs $this->dn= 'cn='.$baseobject->cn.','.get_ou('ogroupRDN').$baseobject->base; } - /* Only delete attributes if there are members left */ - if (count($this->by_object['ogroup']->memberList) != 0) { - foreach(array_keys($this->to_remove) as $object) { - $this->to_remove[$object]->remove_from_parent(); - } + foreach(array_keys($this->to_remove) as $object) { + $this->to_remove[$object]->remove_from_parent(); } tabs::save(); } -- 2.30.2