From a16cf3bb7cdae47b4729365593bb0b3a43c5c466 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 09 Nov 2014 10:02:03 -0500
Subject: [PATCH] Replace all attachment-image URIs with CID URIs, not only src and poster attributes (#1490132)
---
program/steps/mail/sendmail.inc | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index d3cbdf0..41bcfa6 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -428,8 +428,7 @@
$attachment = $RCMAIL->plugins->exec_hook('attachment_get', $attachment);
if ($isHtml) {
- $dispurl = '/\s(poster|src)\s*=\s*[\'"]*\S+display-attachment\S+file=rcmfile'
- . preg_quote($attachment['id']) . '[\s\'"]*/';
+ $dispurl = '/[\'"]\S+display-attachment\S+file=rcmfile' . preg_quote($attachment['id']) . '[\'"]/';
$message_body = $MAIL_MIME->getHTMLBody();
$is_inline = preg_match($dispurl, $message_body);
}
@@ -449,7 +448,7 @@
$cid .= '@localhost';
}
- $message_body = preg_replace($dispurl, ' \\1="cid:' . $cid . '" ', $message_body);
+ $message_body = preg_replace($dispurl, '"cid:' . $cid . '"', $message_body);
$MAIL_MIME->setHTMLBody($message_body);
--
Gitblit v1.9.1