Changeset 2286 in subversion


Ignore:
Timestamp:
Feb 10, 2009 6:49:29 AM (4 years ago)
Author:
alec
Message:
  • Use default_charset for messages without specified charset (#1485661, #1484961)
Location:
trunk/roundcubemail
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/roundcubemail/CHANGELOG

    r2282 r2286  
    11CHANGELOG RoundCube Webmail 
    22--------------------------- 
     3 
     42009/02/10 (alec) 
     5---------- 
     6- Use default_charset for messages without specified charset (#1485661, #1484961) 
    37 
    482009/02/08 (thomasb) 

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

    r2263 r2286  
    296296 
    297297 
    298     if (!empty($header->charset)) 
    299       $IMAP->set_charset($header->charset); 
     298    $IMAP->set_charset(!empty($header->charset) ? $header->charset : $CONFIG['default_charset']); 
    300299   
    301300    // format each col 
    … …  
    405404      continue; 
    406405 
    407     if (!empty($header->charset)) 
    408       $IMAP->set_charset($header->charset); 
     406    $IMAP->set_charset(!empty($header->charset) ? $header->charset : $CONFIG['default_charset']); 
    409407 
    410408    // remove 'attachment' and 'flag' columns, we don't need them here 
Note: See TracChangeset for help on using the changeset viewer.