From dbac6bf8f0e05ed20b6bbbc18f44a704a58cb778 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 17 Jun 2011 13:27:45 +0000 Subject: [PATCH] fixed fatal error using "Insert in document" dropdown in calendar sidebox --- calendar/inc/class.calendar_ui.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php index a5854dcb57..ad79443e75 100644 --- a/calendar/inc/class.calendar_ui.inc.php +++ b/calendar/inc/class.calendar_ui.inc.php @@ -901,7 +901,8 @@ function load_cal(url,id) { } else { $filename = $_GET['merge']; } - return calendar_uilist::download_document($timespan, $filename); + $merge = new calendar_merge(); + return $merge->download($filename, $timespan, '', $GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir']); } return false; }