summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorsvncommit <devs@roundcube.net>2006-09-27 12:58:02 +0000
committersvncommit <devs@roundcube.net>2006-09-27 12:58:02 +0000
commit4e6eb1fb074be2b8d95a2b77dc10cc0d8d51bd5d (patch)
tree93a2bfcc9d40645ce5f1a48933e76edca81b4815 /program
parent0dff24f4eee5850ffd05f01a2811ae87033f7907 (diff)
corrected duplicate emoticon fix.
Diffstat (limited to 'program')
-rw-r--r--program/steps/mail/sendmail.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 3cf5bd1f7..c3e0170fe 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -101,21 +101,21 @@ function rcmail_attach_emoticons(&$mime_message)
$pos + strlen($searchstr),
$pos2 - ($pos + strlen($searchstr)));
+ $body_post = substr($body, $pos2);
+
if (! in_array($image_name, $included_images))
{
- $body_post = substr($body, $pos2);
-
// add the image to the MIME message
$img_file = $INSTALL_PATH . '/' . $searchstr . $image_name;
if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, '_' . $image_name))
{
show_message("emoticonerror", 'error');
}
-
- $body = $body_pre . 'cid:_' . $image_name . $body_post;
array_push($included_images, $image_name);
}
+ $body = $body_pre . 'cid:_' . $image_name . $body_post;
+
$last_img_pos = $pos2;
}