extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-13 17:38:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar/ImportExport: fix PHP Fatal error when importing

Browse Source
This commit is contained in:
Ralf Becker 2016-06-21 16:21:19 +02:00
parent fdf515f84a
commit b4d8b9e747
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
importexport/inc/class.importexport_import_ui.inc.php
View File

@ -48,7 +48,7 @@ use EGroupware\Api\Etemplate;
// We use some inline js in preview results if it fails // We use some inline js in preview results if it fails
Api\Header\ContentSecurityPolicy::add('script-src', "unsafe-inline"); Api\Header\ContentSecurityPolicy::add('script-src', "unsafe-inline");
$template = new Etemplate('importexport.import_dialog'); $template = new Etemplate('importexport.import_dialog');
// Load application's translations // Load application's translations
@ -102,7 +102,7 @@ use EGroupware\Api\Etemplate;
// Destination if we need to hold the file // Destination if we need to hold the file
if($file) if($file)
{ {
$cachefile = new egw_cache_files(array()); $cachefile = new Api\Cache\Files(array());
$dst_file = $cachefile->filename(Api\Cache::keys(Api\Cache::INSTANCE, 'importexport', $dst_file = $cachefile->filename(Api\Cache::keys(Api\Cache::INSTANCE, 'importexport',
'import_'.md5($content['file']['name'].$GLOBALS['egw_info']['user']['account_id']), true),true); 'import_'.md5($content['file']['name'].$GLOBALS['egw_info']['user']['account_id']), true),true);
// Keep file // Keep file