forked from extern/egroupware
fixed fatal error using "Insert in document" dropdown in calendar sidebox
This commit is contained in:
parent
81b78a8e65
commit
dbac6bf8f0
@ -901,7 +901,8 @@ function load_cal(url,id) {
|
|||||||
} else {
|
} else {
|
||||||
$filename = $_GET['merge'];
|
$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;
|
return false;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user