Changeset 7003206 in github

Timestamp:

Sep 3, 2008 7:41:05 AM (5 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

c8ae249

Parents:

97e9d16

Message:

• Fix Reply-To header displaying (#1485314)

Files:

• CHANGELOG (modified) (1 diff)
• program/steps/mail/func.inc (modified) (3 diffs)

CHANGELOG

@@ -6 +6 @@
 - Add RFC2231 header value continuations support for attachment
   filenames + hack for servers that not support that feature
+- Fix Reply-To header displaying (#1485314)
 
 2008/09/02 (thomasb)

program/steps/mail/func.inc

@@ -743 +743 @@
 
   // show these headers
-  $standard_headers = array('subject', 'from', 'organization', 'to', 'cc', 'bcc', 'reply-to', 'date');
+  $standard_headers = array('subject', 'from', 'organization', 'to', 'cc', 'bcc', 'replyto', 'date');
   
   foreach ($standard_headers as $hkey)
@@ -750 +750 @@
       continue;
 
-    if ($hkey=='date' && !empty($headers[$hkey]))
+    if ($hkey == 'date')
       {
       if ($PRINT_MODE)
@@ -757 +757 @@
         $header_value = format_date($headers[$hkey]);
       }
-    else if (in_array($hkey, array('from', 'to', 'cc', 'bcc', 'reply-to')))
+    else if ($hkey == 'replyto')
+      {
+      if ($headers['replyto'] != $headers['from'])
+        $header_value = Q(rcmail_address_string($headers['replyto'], null, true, $attrib['addicon']), 'show');
+      else
+        continue;
+      }
+    else if (in_array($hkey, array('from', 'to', 'cc', 'bcc')))
       $header_value = Q(rcmail_address_string($headers[$hkey], null, true, $attrib['addicon']), 'show');
     else