Skip to content

Commit

Permalink
The header charset for attachments is always UTF-8 (Bug #14618).
Browse files Browse the repository at this point in the history
  • Loading branch information
yunosh committed Apr 28, 2017
1 parent f9ce318 commit d121cc6
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions imp/lib/Compose.php
Expand Up @@ -3274,6 +3274,7 @@ protected function _addAttachment($atc_file, $bytes, $filename, $type)
}

$atc->setType($type);
$atc->setHeaderCharset('UTF-8');

if (($atc->getType() == 'application/octet-stream') ||
($atc->getPrimaryType() == 'text')) {
Expand All @@ -3288,8 +3289,6 @@ protected function _addAttachment($atc_file, $bytes, $filename, $type)
} else {
$atc->setCharset('UTF-8');
}
} else {
$atc->setHeaderCharset('UTF-8');
}

$atc_ob = new IMP_Compose_Attachment($this, $atc, $atc_file);
Expand Down

0 comments on commit d121cc6

Please sign in to comment.