diff options
| author | Andy Wermke <andy@dev.next-step-software.com> | 2013-04-08 14:33:51 +0200 |
|---|---|---|
| committer | Andy Wermke <andy@dev.next-step-software.com> | 2013-04-08 14:33:51 +0200 |
| commit | bf3084b608b8a1036f0b091140350813d54c3d0d (patch) | |
| tree | 117dfd4d6db9f03eec4d227d6b1911c3d4882284 /program/lib/Roundcube/rcube_message_header.php | |
| parent | fe245e5f5dbea1c18517471103185e04a52c89b3 (diff) | |
| parent | 4fdaa02ac724e597479a4a48388a8a10101000fd (diff) | |
Merge branch 'master' of https://github.com/roundcube/roundcubemail
Diffstat (limited to 'program/lib/Roundcube/rcube_message_header.php')
| -rw-r--r-- | program/lib/Roundcube/rcube_message_header.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube_message_header.php b/program/lib/Roundcube/rcube_message_header.php index 274ae7f9f..2c5e2b6c8 100644 --- a/program/lib/Roundcube/rcube_message_header.php +++ b/program/lib/Roundcube/rcube_message_header.php @@ -215,7 +215,12 @@ class rcube_message_header $value = $this->others[$name]; } - return $decode ? rcube_mime::decode_header($value, $this->charset) : $value; + if ($decode) { + $value = rcube_mime::decode_header($value, $this->charset); + $value = rcube_charset::clean($value); + } + + return $value; } /** |