From 2854fc83324af0a51a23c70a13161b230e769369 Mon Sep 17 00:00:00 2001
From: Paul Mehrer
Date: Wed, 9 Dec 2020 10:59:08 +0100
Subject: [PATCH] fix(Calendar VCalendar) improve attachment filename handling
Change-Id: I605ef3683e619399a0697d4fa76402c0b9438a3b
Reviewed-on: http://gerrit.tine20.com/customers/18673
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Paul Mehrer
---
tine20/Calendar/Convert/Event/VCalendar/Abstract.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tine20/Calendar/Convert/Event/VCalendar/Abstract.php b/tine20/Calendar/Convert/Event/VCalendar/Abstract.php
index 51f49399a0d..4865ec9f2df 100644
--- a/tine20/Calendar/Convert/Event/VCalendar/Abstract.php
+++ b/tine20/Calendar/Convert/Event/VCalendar/Abstract.php
@@ -460,8 +460,10 @@ protected function _addAttachments($vevent, $vcalendar, $event)
*/
protected function _getAttachmentFilename($string)
{
- $filename = str_replace([' ', '/'], '_', $string);
- $filename = iconv("UTF-8", "ascii//TRANSLIT", $filename);
+ $string = str_replace([' ', '/'], '_', $string);
+ if (false === ($filename = @iconv("UTF-8", "ascii//TRANSLIT", $string))) {
+ $filename = iconv("UTF-8", "ascii//IGNORE", $string);
+ }
return $filename;
}