Merge master into use_javascript_for_phrase_edit

2024-12-01 18:55:36 -04:00
parent da9be6e02a 91dcc94e82
commit 2bf4b6640d
7 changed files with 173 additions and 139 deletions
@@ -47,7 +47,11 @@ function parse_message_decode_text($connection, &$part, $message_number, $id, $o
 			}
 		}
 		if($charset){
-			$msg = mb_convert_encoding($msg, $to_charset, $charset);
+			if ($charset === 'windows-1256') {
+				$msg = iconv('windows-1256', 'utf-8', $msg);
+			} else {
+				$msg = mb_convert_encoding($msg, $to_charset, $charset);
+			}
 		}
 		$msg = trim($msg);
 	}