Changeset 4024 in subversion


Ignore:
Timestamp:
Sep 30, 2010 6:07:53 AM (3 years ago)
Author:
alec
Message:
  • Fix charset replacement in HTML message bodies (#1487021)
Location:
trunk/roundcubemail
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/roundcubemail/CHANGELOG

    r4022 r4024  
    1212- Add option do bind for an individual LDAP address book (#1486997) 
    1313- Change reply prefix to display email address only if sender name doesn't exist (#1486550) 
     14- Fix charset replacement in HTML message bodies (#1487021) 
    1415 
    1516RELEASE 0.4.1 

  • trunk/roundcubemail/program/steps/mail/func.inc

    r4023 r4024  
    664664  // charset was converted to UTF-8 in rcube_imap::get_message_part(), 
    665665  // -> change charset specification in HTML accordingly 
    666   $charset_pattern = '(<meta\s+[^>]* content=)[\'"]?(\w+\/\w+;\s*charset=)([a-z0-9-_]+[\'"]?)'; 
     666  $charset_pattern = '(<meta\s+[^>]*content=)[\'"]?(\w+\/\w+;\s*charset=)([a-z0-9-_]+[\'"]?)'; 
    667667  if (preg_match("/$charset_pattern/Ui", $html)) { 
    668668    $html = preg_replace("/$charset_pattern/i", '\\1"\\2'.RCMAIL_CHARSET.'"', $html); 
    … …  
    674674    $html = substr_replace($html, '<meta http-equiv="Content-Type" content="text/html; charset='.RCMAIL_CHARSET.'" />', intval(stripos($html, '<head>')+6), 0); 
    675675  } 
    676  
    677676  // turn relative into absolute urls 
    678677  $html = rcmail_resolve_base($html); 
Note: See TracChangeset for help on using the changeset viewer.