Fix mail integration vfs attachments not working for infolog, tracker and calendar

This commit is contained in:
Hadi Nategh 2015-08-27 13:05:19 +00:00
parent 6231e7e43b
commit ea114fe1b7
2 changed files with 4 additions and 2 deletions

View File

@ -2702,7 +2702,8 @@ class calendar_uiforms extends calendar_ui
{ {
egw_link::link('calendar',$event['link_to']['to_id'],egw_link::DATA_APPNAME, $attachment); egw_link::link('calendar',$event['link_to']['to_id'],egw_link::DATA_APPNAME, $attachment);
} }
else if(is_readable($attachment['tmp_name'])) else if(is_readable($attachment['tmp_name']) ||
(egw_vfs::is_readable($attachment['tmp_name']) && parse_url($attachment['tmp_name'], PHP_URL_SCHEME) === 'vfs'))
{ {
egw_link::link('calendar',$event['link_to']['to_id'],'file', $attachment); egw_link::link('calendar',$event['link_to']['to_id'],'file', $attachment);
} }

View File

@ -1203,7 +1203,8 @@ class infolog_bo
{ {
egw_link::link('infolog',$info['link_to']['to_id'],egw_link::DATA_APPNAME, $attachment); egw_link::link('infolog',$info['link_to']['to_id'],egw_link::DATA_APPNAME, $attachment);
} }
else if(is_readable($attachment['tmp_name'])) else if(is_readable($attachment['tmp_name']) ||
(egw_vfs::is_readable($attachment['tmp_name']) && parse_url($attachment['tmp_name'], PHP_URL_SCHEME) === 'vfs'))
{ {
egw_link::link('infolog',$info['link_to']['to_id'],'file', $attachment); egw_link::link('infolog',$info['link_to']['to_id'],'file', $attachment);
} }