mb_convert_encoding does not support windows-1250. #1037

Signed-off-by: Astinus Eberhard <astinus.eberhard@gmail.com>
nextcloud · Apr 3, 2023 · a47ca70 · a47ca70
1 parent c2fa1ff
commit a47ca70
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/Model/IMAPMessage.php b/lib/Model/IMAPMessage.php
@@ -658,7 +658,11 @@ private function loadBodyData(Horde_Mime_Part $p, $partNo): string {
 		// data is utf-8 by default.
 		$charset = $p->getContentTypeParameter('charset');
 		if ($charset !== null && strtoupper($charset) !== 'UTF-8') {
-			$data = mb_convert_encoding($data, 'UTF-8', $charset);
+			try {
+				$data = mb_convert_encoding($data, 'UTF-8', $charset);
+			} catch (\Throwable $ex) {
+				$data = iconv($charset, 'UTF-8//TRANSLIT', $data);
+			}
 		}
 		return (string)$data;
 	}