[mms] Fix displaying user-defined message headers when multiple-heade…

…rs exist in a single message. Conflicts: imp/docs/CHANGES imp/package.xml
horde · Dec 27, 2013 · 03ec99d · 03ec99d
1 parent 831fc55
commit 03ec99d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
@@ -38,6 +38,8 @@ v6.2.0-git
 v6.1.7
 ------
 
+[mms] Fix displaying user-defined message headers when multiple-headers exist
+      in a single message.
 [mjr] Honor recurrence-id range values when deleting recurring events (Bug
       #12746).
 [mms] Don't provide links to view attachments in compose screen unless the

diff --git a/imp/lib/Ajax/Application/ShowMessage.php b/imp/lib/Ajax/Application/ShowMessage.php
@@ -208,7 +208,15 @@ public function showMessage($args)
             foreach ($user_hdrs as $user_hdr) {
                 $user_val = $mime_headers->getValue($user_hdr);
                 if (!empty($user_val)) {
-                    $headers[] = array('name' => $user_hdr, 'value' => htmlspecialchars($user_val));
+                    if (!is_array($user_val)) {
+                        $user_val = array($user_val);
+                    }
+                    foreach ($user_val as $val) {
+                        $headers[] = array(
+                            'name' => $user_hdr,
+                            'value' => htmlspecialchars($val)
+                        );
+                    }
                 }
             }
             $result['headers'] = array_values($headers);

diff --git a/imp/package.xml b/imp/package.xml
@@ -3441,6 +3441,7 @@
    <date>2013-11-19</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [mms] Fix displaying user-defined message headers when multiple-headers exist in a single message.
 * [mjr] Honor recurrence-id range values when deleting recurring events (Bug #12746).
 * [mms] Don&apos;t provide links to view attachments in compose screen unless the attachment can be displayed (Bug #12841).
    </notes>