From 141eb8a497d847069cf87ce0d204614596338352 Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Thu, 20 May 2010 23:24:25 -0400
Subject: [PATCH] Fix double-addition of e-mail domain to content ID in HTML images
---
program/lib/Mail/mime.php | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/program/lib/Mail/mime.php b/program/lib/Mail/mime.php
index ca54a8a..9065d46 100644
--- a/program/lib/Mail/mime.php
+++ b/program/lib/Mail/mime.php
@@ -848,8 +848,10 @@
$domainID = "@localhost";
}
foreach ($this->_html_images as $i => $img) {
- $this->_html_images[$i]['cid']
- = $this->_html_images[$i]['cid'] . $domainID;
+ $cid = $this->_html_images[$i]['cid'];
+ if (!preg_match('#'.preg_quote($domainID).'$#', $cid)) {
+ $this->_html_images[$i]['cid'] = $cid . $domainID;
+ }
}
}
--
Gitblit v1.9.1