Changeset 80c1eb7 in github


Ignore:
Timestamp:
Aug 21, 2008 2:08:52 AM (5 years ago)
Author:
alecpl <alec@…>
Branches:
master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8
Children:
94edc83
Parents:
3b0eda1
Message:

#1485287: allow underline in html charset for proper replacement

File:
1 edited

Legend:

Unmodified
Added
Removed

  • program/steps/mail/func.inc

    rac5d15d r80c1eb7  
    577577    // charset was converted to UTF-8 in rcube_imap::get_message_part() -> change charset specification in HTML accordingly 
    578578    $html = $part->body;  
    579     if (preg_match('/(\s+content=[\'"]\w+\/\w+;\s*charset)=([a-z0-9-]+)/i', $html))  
    580       $html = preg_replace('/(\s+content=[\'"]\w+\/\w+;\s*charset)=([a-z0-9-]+)/i', '\\1='.RCMAIL_CHARSET, $html);  
     579    if (preg_match('/(\s+content=[\'"]\w+\/\w+;\s*charset)=([a-z0-9-_]+)/i', $html))  
     580      $html = preg_replace('/(\s+content=[\'"]\w+\/\w+;\s*charset)=([a-z0-9-_]+)/i', '\\1='.RCMAIL_CHARSET, $html);  
    581581    else { 
    582582      // add <head> for malformed messages, washtml cannot work without that 
Note: See TracChangeset for help on using the changeset viewer.