From 058553b8d91375cb051892bfc1515540002388fd Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 27 Feb 2012 21:34:34 +0000 Subject: [PATCH] - Fix last[-1] comments - Show custom notification / signature checkboxes for all queues too - Handle message / signature as HTML, not text - When merging HTML, keep the same tags as OO.o & word documents --- etemplate/inc/class.bo_merge.inc.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php index 057541b984..49411cab4c 100644 --- a/etemplate/inc/class.bo_merge.inc.php +++ b/etemplate/inc/class.bo_merge.inc.php @@ -827,6 +827,12 @@ abstract class bo_merge { switch($mimetype.$mso_application_progid) { + case 'text/html': + $replace_tags = array( + '','','','','','','
    ','
      ','
    • ', + '','','
      ', + ); + break; case 'application/vnd.oasis.opendocument.text': // open office case 'application/vnd.oasis.opendocument.spreadsheet': $replace_tags = array(