From 6c953faaa390b6a49d2fd9639f869e8709d23e89 Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Thu, 15 Nov 2012 10:15:23 +0100
Subject: [PATCH] Fixes: #1519 Copy/Paste should be fixed
---
include/class_CopyPasteHandler.inc | 5 ++---
plugins/admin/departments/tabs_department.inc | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/include/class_CopyPasteHandler.inc b/include/class_CopyPasteHandler.inc
index fa3132490..48b03d8d2 100644
--- a/include/class_CopyPasteHandler.inc
+++ b/include/class_CopyPasteHandler.inc
@@ -36,12 +36,12 @@ class CopyPasteHandler {
/*!
* \brief This array contains all dns of the currently copyied objects
*/
- var $queue = array();
+ var $queue = array();
/*!
* \brief The dn of the last edited object
*/
- var $lastdn = "";
+ var $lastdn = "";
var $disallowed_objects = array();
var $objects_to_fix = array();
@@ -157,7 +157,6 @@ class CopyPasteHandler {
if ($entry['method'] == "copy") {
$attrs_wrapper = new stdClass();
$attrs_wrapper->attrs = $entry['source_data'];
- echo "<h1>Creating tab object with copied_object as parameter</h1>";
$entry['object'] = new $tab_c($this->config, $this->config->data['TABS'][$tab_o], "new", $tab_a, $attrs_wrapper);
$entry['object']->set_acl_base($base);
} else {
diff --git a/plugins/admin/departments/tabs_department.inc b/plugins/admin/departments/tabs_department.inc
index bd0e1eec1..74b15db8c 100644
--- a/plugins/admin/departments/tabs_department.inc
+++ b/plugins/admin/departments/tabs_department.inc
@@ -26,7 +26,7 @@ class deptabs extends tabs
var $moved = FALSE;
var $base_name = "department";
- function deptabs($config, $data, $dn, $category, $copied_object)
+ function deptabs($config, $data, $dn, $category, $copied_object = NULL)
{
parent::tabs($config, $data, $dn, $category, $copied_object);
--
GitLab