From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 28 Apr 2006 10:16:53 +0000 (+0000)
Subject: Removed department generation
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ddcfa4a087dfe154740152fa7e5d80226eea9b75;p=gosa.git

Removed department generation


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

diff --git a/plugins/gofon/conference/class_phoneConferenceGeneric.inc b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
index 591bd244d..7da0510bc 100644
--- a/plugins/gofon/conference/class_phoneConferenceGeneric.inc
+++ b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
@@ -111,11 +111,9 @@ class conference extends plugin
 
   function execute()
   {
-	/* Call parent execute */
-	plugin::execute();
+    /* Call parent execute */
+    plugin::execute();
 
-    $this->config->departments    = get_departments($this->dn);
-    $this->config->make_idepartments();
     $smarty= get_smarty();
 
     $smarty->assign("bases" ,$this->config->idepartments);
diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc
index 2dd80d88d..4f481ff19 100644
--- a/plugins/gofon/conference/class_phoneConferenceManagment.inc
+++ b/plugins/gofon/conference/class_phoneConferenceManagment.inc
@@ -67,7 +67,6 @@ class phoneConferenceManagment extends plugin
 	plugin::execute();
 
     /* Reload departments */
-    $this->config->departments	= get_departments();
     $smarty						          = get_smarty();
     $display 					          = "";
     $s_action 					        = "";  // Will contain an action, like del or edit