From 84c9b54bcaf9df532d4673db52ad97ad993e1f6b Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Mon, 3 Aug 2015 13:30:59 -0500
Subject: [PATCH] Fix missing inline attachments for mailouts
---
include/class.mailer.php | 3 +++
include/class.thread.php | 1 -
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/class.mailer.php b/include/class.mailer.php
index 029051a9e..5cd4dfc4b 100644
--- a/include/class.mailer.php
+++ b/include/class.mailer.php
@@ -440,6 +440,9 @@ class Mailer {
break;
}
}
+ if (!$file)
+ // Not attached yet attempt to attach it inline
+ $file = AttachmentFile::lookup($match[1]);
if (!$file)
return $match[0];
$mime->addHTMLImage($file->getData(),
diff --git a/include/class.thread.php b/include/class.thread.php
index c3649b280..c3d58f3b9 100644
--- a/include/class.thread.php
+++ b/include/class.thread.php
@@ -616,7 +616,6 @@ implements TemplateVariable {
var $_headers;
var $_thread;
var $_actions;
- var $_attachments;
static protected $perms = array(
self::PERM_EDIT => array(
--
GitLab