From 539fe0b84ddfd13a6c7d7d86567d05b774980d1b Mon Sep 17 00:00:00 2001 From: brendan braybrook Date: Wed, 6 Aug 2014 00:25:14 +0000 Subject: fix stringify problem when multiple headers values exist to be returned --- program/lib/Roundcube/rcube_message_header.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'program/lib/Roundcube/rcube_message_header.php') diff --git a/program/lib/Roundcube/rcube_message_header.php b/program/lib/Roundcube/rcube_message_header.php index 2bda930eb..b4d20e09a 100644 --- a/program/lib/Roundcube/rcube_message_header.php +++ b/program/lib/Roundcube/rcube_message_header.php @@ -225,8 +225,15 @@ class rcube_message_header } if ($decode) { - $value = rcube_mime::decode_header($value, $this->charset); - $value = rcube_charset::clean($value); + if (is_array($value)) { + foreach ($value as $key=>$val) { + $value[$key] = rcube_mime::decode_header($val, $this->charset); + $value[$key] = rcube_charset::clean($val); + } + } else { + $value = rcube_mime::decode_header($value, $this->charset); + $value = rcube_charset::clean($value); + } } return $value; -- cgit v1.2.3 From 19926d4c3cc2806b331579d1eaf93cae9aa1b26f Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 6 Aug 2014 08:03:56 +0200 Subject: CS fix after PR merge --- program/lib/Roundcube/rcube_message_header.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'program/lib/Roundcube/rcube_message_header.php') diff --git a/program/lib/Roundcube/rcube_message_header.php b/program/lib/Roundcube/rcube_message_header.php index b4d20e09a..2b795e591 100644 --- a/program/lib/Roundcube/rcube_message_header.php +++ b/program/lib/Roundcube/rcube_message_header.php @@ -226,11 +226,12 @@ class rcube_message_header if ($decode) { if (is_array($value)) { - foreach ($value as $key=>$val) { + foreach ($value as $key => $val) { $value[$key] = rcube_mime::decode_header($val, $this->charset); $value[$key] = rcube_charset::clean($val); } - } else { + } + else { $value = rcube_mime::decode_header($value, $this->charset); $value = rcube_charset::clean($value); } -- cgit v1.2.3