X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fdepartments%2Fclass_departmentGeneric.inc;h=4369bb7bc4ff0c25d5b85d6f0dd04e86e305a71e;hb=5b8bb8a4a1de82c23f402770db413493a3a6f9e1;hp=ee0e39fecdb354c14873e9f7fe075c465b808aa6;hpb=043ec1a0e27109c0f690b1cbfdcd9a4e5a63a41f;p=gosa.git

diff --git a/plugins/admin/departments/class_departmentGeneric.inc b/plugins/admin/departments/class_departmentGeneric.inc
index ee0e39fec..4369bb7bc 100644
--- a/plugins/admin/departments/class_departmentGeneric.inc
+++ b/plugins/admin/departments/class_departmentGeneric.inc
@@ -263,7 +263,9 @@ class department extends plugin
 		if ($this->is_administrational_unit){
       if(!in_array_ics("gosaAdministrativeUnit",$this->objectclasses)){
   			$this->objectclasses[]= "gosaAdministrativeUnit";
+			  $this->gosaUnitTag= "";
       }
+
 			if ($this->gosaUnitTag == ""){
 
 				/* It's unlikely, but check if already used... */
@@ -297,13 +299,18 @@ class department extends plugin
 			$tmp= array();
 
 			/* Remove gosaAdministrativeUnit from this plugin */
+      $has_unit_tag= false;
 			foreach($this->attrs['objectClass'] as $oc){
 				if (!preg_match("/^gosaAdministrativeUnit$/i", $oc)){
 					$tmp[]= $oc;
 				}
+				if (preg_match("/^gosaAdministrativeUnitTag$/i", $oc)){
+					$has_unit_tag= true;
+				}
 			}
 			$this->attrs['objectClass']= $tmp;
-			if(isset($this->attrs['gosaUnitTag'])){
+
+			if(!$has_unit_tag && isset($this->attrs['gosaUnitTag'])){
 				$this->attrs['gosaUnitTag']= array();
 			}
 		}