From 4e6eb1fb074be2b8d95a2b77dc10cc0d8d51bd5d Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Wed, 27 Sep 2006 08:58:02 -0400
Subject: [PATCH] corrected duplicate emoticon fix.
---
program/steps/mail/sendmail.inc | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 3cf5bd1..c3e0170 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -101,21 +101,21 @@
$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;
}
--
Gitblit v1.9.1