Merge pull request #209 from bbraybrook/header_array_fix

Fix stringify problem when multiple headers values exist to be returned
10 years ago · 642522f386
parent e32da281bb 539fe0b84d
commit 642522f386
1 changed files with 9 additions and 2 deletions
--- 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;