diff options
| author | estadtherr <estadtherr@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-05-21 03:24:25 +0000 |
|---|---|---|
| committer | estadtherr <estadtherr@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-05-21 03:24:25 +0000 |
| commit | c5d19bfe85e7e6974cb2196c07c0c147cb22afa9 (patch) | |
| tree | d4782280d091964131e43f1580728eb171883c74 /roundcubemail/program/lib/Mail/mime.php | |
| parent | f8fdded0bfc5130ab4be15f042718099ab8f1cd4 (diff) | |
Fix double-addition of e-mail domain to content ID in HTML images
git-svn-id: https://svn.roundcube.net/trunk@3648 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/lib/Mail/mime.php')
| -rw-r--r-- | roundcubemail/program/lib/Mail/mime.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/roundcubemail/program/lib/Mail/mime.php b/roundcubemail/program/lib/Mail/mime.php index ca54a8a6c..9065d469a 100644 --- a/roundcubemail/program/lib/Mail/mime.php +++ b/roundcubemail/program/lib/Mail/mime.php @@ -848,8 +848,10 @@ class Mail_mime $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; + } } } |