summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-10-22 14:24:32 +0200
committerThomas Bruederli <thomas@roundcube.net>2012-10-22 14:24:32 +0200
commit3715694887e6b234cc266ed72035e1716da119de (patch)
tree8743e3131e37b5aaade2c7d9ada1c08c9b002fe7 /program/steps
parente6a074715539e0e668665a8867a1a504edfb1bb8 (diff)
parent05a580a11775f0cf157f29cb7f26ae18ed60cb08 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/mail/sendmail.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 751af0694..9fe510794 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -73,6 +73,7 @@ function rcmail_encrypt_header($what)
function rcmail_get_identity($id)
{
global $RCMAIL, $message_charset;
+ global $RCMAIL;
if ($sql_arr = $RCMAIL->user->get_identity($id)) {
$out = $sql_arr;
@@ -101,7 +102,7 @@ function rcmail_get_identity($id)
*/
function rcmail_fix_emoticon_paths($mime_message)
{
- global $CONFIG;
+ global $RCMAIL;
$body = $mime_message->getHTMLBody();
@@ -126,8 +127,9 @@ function rcmail_fix_emoticon_paths($mime_message)
if (! in_array($image_name, $included_images)) {
// add the image to the MIME message
- if (! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, $image_name))
- $OUTPUT->show_message("emoticonerror", 'error');
+ if (!$mime_message->addHTMLImage($img_file, 'image/gif', '', true, $image_name)) {
+ $RCMAIL->output->show_message("emoticonerror", 'error');
+ }
array_push($included_images, $image_name);
}