Changeset 1668 in subversion

Timestamp:

Aug 21, 2008 9:09:08 AM (5 years ago)

Author:

estadtherr

Message:

change to double-escape to get through TinyMCE's cleanup #1484904

File:

• trunk/roundcubemail/program/steps/mail/compose.inc (modified) (4 diffs)

trunk/roundcubemail/program/steps/mail/compose.inc

@@ -459 +459 @@
 function rcmail_create_reply_body($body, $bodyIsHtml)
 {
-  global $IMAP, $MESSAGE;
+  global $IMAP, $MESSAGE, $OUTPUT;
 
   if (! $bodyIsHtml)
@@ -497 +497 @@
     $prefix = sprintf("<br /><br />On %s, %s wrote:<br />\n",
       $MESSAGE->headers->date,
-      Q($MESSAGE->get_header('from'), 'replace'));
+      htmlspecialchars(Q($MESSAGE->get_header('from'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset(), true));
     $prefix .= '<blockquote type="cite" style="padding-left:5px; border-left:#1010ff 2px solid; margin-left:5px; width:100%">';
     $suffix = "</blockquote>";
@@ -508 +508 @@
 function rcmail_create_forward_body($body, $bodyIsHtml)
 {
-  global $IMAP, $MESSAGE;
+  global $IMAP, $MESSAGE, $OUTPUT;
 
   if (!$bodyIsHtml)
@@ -533 +533 @@
       Q($MESSAGE->subject),
       Q($MESSAGE->headers->date),
-      Q($MESSAGE->get_header('from'), 'replace'),
-      Q($MESSAGE->get_header('to'), 'replace'));
+      htmlspecialchars(Q($MESSAGE->get_header('from'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset(), true),
+      htmlspecialchars(Q($MESSAGE->get_header('to'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset(), true));
   }