From 1177886c79b91ccd8e1ead4476e912ce0be9e182 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 3 Mar 2008 10:10:08 +0000
Subject: [PATCH] Updated copy & paste

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9234 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../gofon/conference/class_phoneConferenceManagment.inc      | 5 +----
 .../gofon/gofon/macro/class_gofonMacroManagement.inc         | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
index 55bdfda21..7f8712686 100644
--- a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
+++ b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
@@ -503,12 +503,9 @@ class phoneConferenceManagment extends plugin
     /* Return C&P dialog */
     if($this->start_pasting_copied_objects && $this->CopyPasteHandler->entries_queued()){
 
-      /* Load entry from queue and set base */
-      $this->CopyPasteHandler->load_entry_from_queue();
-      $this->CopyPasteHandler->SetVar("base",$this->DivListConference->selectedBase);
-
       /* Get dialog */
       $data = $this->CopyPasteHandler->execute();
+      $this->CopyPasteHandler->SetVar("base",$this->DivListConference->selectedBase);
 
       /* Return dialog data */
       if(!empty($data)){
diff --git a/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc b/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc
index 2fd564009..e60c943b2 100644
--- a/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc
+++ b/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc
@@ -465,12 +465,9 @@ class goFonMacro extends plugin
     /* Return C&P dialog */
     if($this->start_pasting_copied_objects && $this->CopyPasteHandler->entries_queued()){
 
-      /* Load entry from queue and set base */
-      $this->CopyPasteHandler->load_entry_from_queue();
-      $this->CopyPasteHandler->SetVar("base",$this->DivListMacro->selectedBase);
-
       /* Get dialog */
       $data = $this->CopyPasteHandler->execute();
+      $this->CopyPasteHandler->SetVar("base",$this->DivListMacro->selectedBase);
 
       /* Return dialog data */
       if(!empty($data)){
-- 
2.30.2