From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 27 Jun 2005 06:25:37 +0000 (+0000)
Subject: Removed attribute 'macro', it will cause an error when deleting entries, with macros
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b9635d93694f48c73ed531cf00bb9924a9b92e8b;p=gosa.git

Removed attribute 'macro', it will cause an error when deleting entries, with macros


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

diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc
index 1dc4a8d25..0181f5763 100644
--- a/plugins/gofon/phoneaccount/class_phoneAccount.inc
+++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc
@@ -577,6 +577,11 @@ class phoneAccount extends plugin
 
   function remove_from_parent()
   {
+    /* unset macro attr, it will cause an error */
+    $tmp = array_flip($this->attributes);
+    unset($tmp['macro']);
+    $this->attributes=array_flip($tmp);
+  
     /* Cancel if there's nothing to do here */
     if (!$this->initially_was_account){
       return;