Changeset 4223 in subversion for trunk/roundcubemail/program/steps/mail/compose.inc

Timestamp:

Nov 14, 2010 6:35:38 AM (3 years ago)

Author:

alec

Message:

• Fix hanling of HTML entity strings in plai text messages

File:

• trunk/roundcubemail/program/steps/mail/compose.inc (modified) (1 diff)

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

@@ -647 +647 @@
 
   // If desired, set this textarea to be editable by TinyMCE
-  if ($isHtml) $attrib['class'] = 'mce_editor';
-  $textarea = new html_textarea($attrib);
-  $out .= $textarea->show($MESSAGE_BODY);
+  if ($isHtml) {
+    $attrib['class'] = 'mce_editor';
+    $textarea = new html_textarea($attrib);
+    $out .= $textarea->show($MESSAGE_BODY);
+  }
+  else {
+    $textarea = new html_textarea($attrib);
+    $out .= $textarea->show('');
+    // quote plain text, inject into textarea
+    $table = get_html_translation_table(HTML_SPECIALCHARS);
+    $MESSAGE_BODY = strtr($MESSAGE_BODY, $table);
+    $out = substr($out, 0, -11) . $MESSAGE_BODY . '</textarea>';
+  }
+
   $out .= $form_end ? "\n$form_end" : '';