From 0529ea22e3b1bd157ce8c5e79be29d2844cc823a Mon Sep 17 00:00:00 2001 From: Marci Blum Date: Fri, 8 Nov 2024 08:33:42 +0100 Subject: [PATCH] Fix #567 - Using iconv_mime_encode to fix email sending --- .../legacy/include/Localization/Localization.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/public/legacy/include/Localization/Localization.php b/public/legacy/include/Localization/Localization.php index 5f65d5598d..c80c498dd1 100755 --- a/public/legacy/include/Localization/Localization.php +++ b/public/legacy/include/Localization/Localization.php @@ -451,11 +451,15 @@ public function addBOM($string, $fromCharset) */ public function translateCharsetMIME($string, $fromCharset, $toCharset = 'UTF-8', $encoding = "Q") { - $previousEncoding = mb_internal_encoding(); - mb_internal_encoding($fromCharset); - $result = mb_encode_mimeheader($string, $toCharset, $encoding); - mb_internal_encoding($previousEncoding); - return $result; + $preferences = array( + 'input-charset' => $fromCharset, + 'output-charset' => $toCharset, + 'line-length' => 76, + 'scheme' => $encoding, + 'line-break-chars' => "\n" + ); + $result = iconv_mime_encode('', $string, $preferences); + return substr($result, 2); } public function normalizeCharset($charset)