* Mail: handle (and correct (if needed)) charset for subject on import of messages

This commit is contained in:
Klaus Leithoff 2014-10-02 10:04:45 +00:00
parent 9d62aa6264
commit 943771a3e4

View File

@ -6160,7 +6160,13 @@ class emailadmin_imapbase
if (stripos($val,'calendar')) $contenttypecalendar = $val; if (stripos($val,'calendar')) $contenttypecalendar = $val;
break; break;
case 'subject': case 'subject':
$mailObject->Subject = $mailObject->EncodeHeader($mailObject->SecureHeader($val)); /*
error_log(__METHOD__.__LINE__.$val);
error_log(__METHOD__.__LINE__.$mailObject->SecureHeader($val));
error_log(__METHOD__.__LINE__.translation::convert($mailObject->SecureHeader($val),false,$mailObject->CharSet));
error_log(__METHOD__.__LINE__.$mailObject->EncodeHeader($mailObject->SecureHeader($val)));
*/
$mailObject->Subject = $mailObject->EncodeHeader(translation::convert($mailObject->SecureHeader($val),false,$mailObject->CharSet));
$Header .= $mailObject->HeaderLine('Subject',$mailObject->Subject); $Header .= $mailObject->HeaderLine('Subject',$mailObject->Subject);
break; break;
default: default: