diff options
| author | till <till@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-02-02 02:11:15 +0000 |
|---|---|---|
| committer | till <till@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-02-02 02:11:15 +0000 |
| commit | e86a6fe0261e179267f121a72ba39d09743ce8cc (patch) | |
| tree | 943662b7096f52e5c41bba231b7d583c70922ca8 /roundcubemail/program | |
| parent | 86ee0f0dac68965a70f1f1062211b2981f18550c (diff) | |
* minor cs
* fixed #1484712
git-svn-id: https://svn.roundcube.net/trunk@985 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
| -rw-r--r-- | roundcubemail/program/lib/imap.inc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/roundcubemail/program/lib/imap.inc b/roundcubemail/program/lib/imap.inc index c3f1a2f4d..fa2fe2a51 100644 --- a/roundcubemail/program/lib/imap.inc +++ b/roundcubemail/program/lib/imap.inc @@ -1543,7 +1543,7 @@ function iil_C_FetchHeaders(&$conn, $mailbox, $message_set, $uidfetch=false) { switch ($field) { case 'date'; - $result[$id]->date = $string; + $result[$id]->date = $string; $result[$id]->timestamp = iil_StrToTime($string); break; case 'from': @@ -1571,9 +1571,11 @@ function iil_C_FetchHeaders(&$conn, $mailbox, $message_set, $uidfetch=false) { $ctype_parts = explode(";", $string); $result[$id]->ctype = array_shift($ctype_parts); foreach ($ctype_parts as $ctype_add) - if (preg_match('/charset="?([a-z0-9\-]+)"?/i', $ctype_add, $regs)) - $result[$id]->charset = $regs[1]; - break; + if (preg_match('/charset="?([a-z0-9\-\.\_]+)"?/i', + $ctype_add, $regs)) { + $result[$id]->charset = $regs[1]; + } + break; case 'in-reply-to': $result[$id]->in_reply_to = ereg_replace("[\n<>]", '', $string); break; |