From 1b01432c6ffd335297c4f40a4b74fd6d5ed19f5b Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 21 Sep 2006 10:34:45 +0000 Subject: [PATCH] Fixed remove of sub entries git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@4756 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/fai/class_faiHook.inc | 4 +++- plugins/admin/fai/class_faiTemplate.inc | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/admin/fai/class_faiHook.inc b/plugins/admin/fai/class_faiHook.inc index a190d28f3..75555fd01 100644 --- 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 20497bfaa..8e7cf4005 100644 --- 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]); -- 2.30.2