summaryrefslogtreecommitdiff
path: root/roundcubemail/program
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-10-23 08:26:17 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-10-23 08:26:17 +0000
commit8c4c36fba9a61961febeefd8e6994b97a7723ae6 (patch)
tree6e75d958ade0d9c04821334198e5615c0816b7e6 /roundcubemail/program
parent2ca1eb670f35240c832d450b7d2fc354d38a5d48 (diff)
- Add underline character to charset regexp
git-svn-id: https://svn.roundcube.net/trunk@5359 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
-rw-r--r--roundcubemail/program/include/rcube_imap.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php
index b04a28615..e5d2afc11 100644
--- a/roundcubemail/program/include/rcube_imap.php
+++ b/roundcubemail/program/include/rcube_imap.php
@@ -2403,7 +2403,7 @@ class rcube_imap
if (!$skip_charset_conv) {
if (!$o_part->charset || strtoupper($o_part->charset) == 'US-ASCII') {
// 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))
+ 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;