From 9fab35a5ce7a2c5a7f64f8ffea0a7f4f24c6f0b0 Mon Sep 17 00:00:00 2001
From: JediKev <kevin@enhancesoft.com>
Date: Thu, 23 Aug 2018 14:31:41 -0500
Subject: [PATCH] issue: Image CID Attributes

This addresses an issue where images in email signatures containing a
`data-cid` attribute will either crash the ticket page or not show the image
in the signature.
---
 include/class.format.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/class.format.php b/include/class.format.php
index 05d869988..a2d72340d 100644
--- a/include/class.format.php
+++ b/include/class.format.php
@@ -308,8 +308,9 @@ class Format {
                   ':<html[^>]+:i',              # drop html attributes
                   ':<(a|span) (name|style)="(mso-bookmark\:)?_MailEndCompose">(.+)?<\/(a|span)>:', # Drop _MailEndCompose
                   ':<div dir=(3D)?"ltr">(.*?)<\/div>(.*):is', # drop Gmail "ltr" attributes
+                  ':data-cid="[^"]*":',         # drop image cid attributes
             ),
-            array('', '', '', '', '<html', '$4', '$2 $3'),
+            array('', '', '', '', '<html', '$4', '$2 $3', ''),
             $html);
 
         // HtmLawed specific config only
-- 
GitLab