From 642522f38656410589fd5693f9baea0f54530e89 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 06 Aug 2014 02:03:15 -0400
Subject: [PATCH] Merge pull request #209 from bbraybrook/header_array_fix
---
program/lib/Roundcube/rcube_message_header.php | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/program/lib/Roundcube/rcube_message_header.php b/program/lib/Roundcube/rcube_message_header.php
index 2bda930..b4d20e0 100644
--- a/program/lib/Roundcube/rcube_message_header.php
+++ b/program/lib/Roundcube/rcube_message_header.php
@@ -225,8 +225,15 @@
}
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;
--
Gitblit v1.9.1