From ab0522f774e39f58ee12cbc21cabedce89da5e3d Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Tue, 24 May 2011 14:45:27 +0000 Subject: [PATCH] Allow merging into files given by path --- calendar/inc/class.calendar_ui.inc.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php index 71073d0132..a3afa5b2f7 100644 --- a/calendar/inc/class.calendar_ui.inc.php +++ b/calendar/inc/class.calendar_ui.inc.php @@ -861,7 +861,11 @@ function load_cal(url,id) { 'end' => is_array($this->last) ? $this->bo->date2ts($this->last) : $this->last )); } - list($document, $filename) = explode('_',$_GET['merge'], 2); + if($_GET['merge'][0] != '/') { + list($document, $filename) = explode('_',$_GET['merge'], 2); + } else { + $filename = $_GET['merge']; + } return calendar_uilist::download_document($timespan, $filename); } return false;