From becd608ce9e2eb32575f1953cc8edb1fa99028a1 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 8 Mar 2019 11:26:25 +0100 Subject: [PATCH] rtf seems to user iso-8859-1 or equivalent windows charset, not utf-8 --- api/src/Storage/Merge.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php index 0378ee66a8..5c365e6ed4 100644 --- a/api/src/Storage/Merge.php +++ b/api/src/Storage/Merge.php @@ -1038,6 +1038,11 @@ abstract class Merge $charset = 'utf-8'; // xml files --> always use utf-8 break; + case 'application/rtf': + case 'text/rtf': + $charset = 'iso-8859-1'; // rtf seems to user iso-8859-1 or equivalent windows charset, not utf-8 + break; + case 'text/html': $is_xml = true; $matches = null;