[Svn] r1667 - trunk/roundcubemail/program/steps/mail

[trac at roundcube.net]

Author: estadtherr
Date: 2008-08-21 12:38:10 +0000 (Thu, 21 Aug 2008)
New Revision: 1667

Modified:
   trunk/roundcubemail/program/steps/mail/compose.inc
Log:
escape html entities in forward/reply headers #1484904

Modified: trunk/roundcubemail/program/steps/mail/compose.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/compose.inc	2008-08-21 07:57:25 UTC (rev 1666)
+++ trunk/roundcubemail/program/steps/mail/compose.inc	2008-08-21 12:38:10 UTC (rev 1667)
@@ -496,7 +496,7 @@
   {
     $prefix = sprintf("<br /><br />On %s, %s wrote:<br />\n",
       $MESSAGE->headers->date,
-      Q($MESSAGE->get_header('from')));
+      Q($MESSAGE->get_header('from'), 'replace'));
     $prefix .= '<blockquote type="cite" style="padding-left:5px; border-left:#1010ff 2px solid; margin-left:5px; width:100%">';
     $suffix = "</blockquote>";
   }
@@ -513,7 +513,7 @@
   {
     // soft-wrap message first
     $body = wordwrap($body, 80);
-  
+
     $prefix = sprintf("\n\n\n-------- Original Message --------\nSubject: %s\nDate: %s\nFrom: %s\nTo: %s\n\n",
       $MESSAGE->subject,
       $MESSAGE->headers->date,
@@ -532,8 +532,8 @@
         "</tbody></table><br>",
       Q($MESSAGE->subject),
       Q($MESSAGE->headers->date),
-      Q($MESSAGE->get_header('from')),
-      Q($MESSAGE->get_header('to')));
+      Q($MESSAGE->get_header('from'), 'replace'),
+      Q($MESSAGE->get_header('to'), 'replace'));
   }
 
   // add attachments

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn