From 7a57615e38ff4cee1cbd0bc4b23c517e5aa46849 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 27 Aug 2015 10:12:55 +0000 Subject: [PATCH] Fix mail integration vfs attachments not working for infolog, tracker and calendar --- calendar/inc/class.calendar_uiforms.inc.php | 3 ++- infolog/inc/class.infolog_bo.inc.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php index 9092546f91..ab86994030 100644 --- a/calendar/inc/class.calendar_uiforms.inc.php +++ b/calendar/inc/class.calendar_uiforms.inc.php @@ -2855,7 +2855,8 @@ class calendar_uiforms extends calendar_ui { 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); } diff --git a/infolog/inc/class.infolog_bo.inc.php b/infolog/inc/class.infolog_bo.inc.php index 0bbec6c88d..6f66cc2fbd 100644 --- a/infolog/inc/class.infolog_bo.inc.php +++ b/infolog/inc/class.infolog_bo.inc.php @@ -1186,7 +1186,8 @@ class infolog_bo { 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); }