Mirrors/roundcubemail
2
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail.git synced 2026-03-14 03:56:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Find charset in HTML meta tags if not specified in content-type header (#1488125)

Browse Source
This commit is contained in:
thomascube
2011-10-18 10:09:32 +00:00
parent 54b0d86aad
commit dfc79b341c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
program/include/rcube_imap.php
View File

@@ -2396,7 +2396,11 @@ class rcube_imap
if (!$skip_charset_conv) {
if (!$o_part->charset || strtoupper($o_part->charset) == 'US-ASCII') {
$o_part->charset = $this->default_charset;
// try to extract charset information from HTML meta tag (#1488125)
if ($o_part->ctype_secondary == 'html' && preg_match('/<meta[^>]+charset=([a-z0-9-]+)/i', $body, $m))
$o_part->charset = strtoupper($m[1]);
else
$o_part->charset = $this->default_charset;
}
$body = rcube_charset_convert($body, $o_part->charset);
}