From 371321f9a81d801444a756e969b5e348782c61b9 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Thu, 28 May 2015 15:15:51 -0500
Subject: [PATCH] oops: Fix crash sending email with inline images
---
include/class.mailer.php | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/include/class.mailer.php b/include/class.mailer.php
index a752d4043..f41d0e55a 100644
--- a/include/class.mailer.php
+++ b/include/class.mailer.php
@@ -433,11 +433,10 @@ class Mailer {
function($match) use ($domain, $mime, $self) {
$file = false;
foreach ($self->attachments as $id=>$F) {
+ if ($F instanceof Attachment)
+ $F = $F->getFile();
if (strcasecmp($F->getKey(), $match[1]) === 0) {
- if ($F instanceof Attachment)
- $file = $F->getFile();
- else
- $file = $F;
+ $file = $F;
break;
}
}
--
GitLab