extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow merging into files given by path

Browse Source
This commit is contained in:
Nathan Gray 2011-05-24 14:45:27 +00:00
parent 24b454a3fb
commit ab0522f774
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/inc/class.calendar_ui.inc.php
View File

@ -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;