Fixed remove of sub entries

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@4756 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/fai/class_faiHook.inc b/plugins/admin/fai/class_faiHook.inc
index a190d28f3abd4b986c4f396832c71f54df9d2e50..75555fd0134bcadbc7ac6939cc9bb8793d02754e 100644 (file)
--- a/plugins/admin/fai/class_faiHook.inc
+++ b/plugins/admin/fai/class_faiHook.inc
@@ -162,7 +162,9 @@ class faiHook extends plugin
         $once = false;
         $entry = preg_replace("/^deletescript_/","",$name);
         $entry = base64_decode(preg_replace("/_.*/","",$entry));
-        if($this->SubObjects[$entry]['status'] == "edited"){
+
+        $status = $this->SubObjects[$entry]['status'];
+        if($status == "edited" || $status == "FreshLoaded"){
           $this->SubObjects[$entry]['status']= "delete";
         }else{
           unset($this->SubObjects[$entry]);

diff --git a/plugins/admin/fai/class_faiTemplate.inc b/plugins/admin/fai/class_faiTemplate.inc
index 20497bfaa5583f9007b1f5c6ec1c84d40480ef35..8e7cf40054ce44b78d31b99f077a137a2c051c89 100644 (file)
--- a/plugins/admin/fai/class_faiTemplate.inc
+++ b/plugins/admin/fai/class_faiTemplate.inc
@@ -149,7 +149,9 @@ class faiTemplate extends plugin
         $once = false;
         $entry = preg_replace("/^deletescript_/","",$name);
         $entry = base64_decode(preg_replace("/_.*/","",$entry));
-        if($this->SubObjects[$entry]['status'] == "edited"){
+
+        $status = $this->SubObjects[$entry]['status'];
+        if($status == "edited" || $status == "FreshLoaded"){
           $this->SubObjects[$entry]['status']= "delete";
         }else{
           unset($this->SubObjects[$entry]);