From ed42ff12e76fd626d6348665cc28415fcc052715 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 14 Jun 2008 13:37:29 -0400
Subject: [PATCH] Bugfix: call msg->set_safe() before checking msg->is_save
---
program/steps/mail/show.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 8b6ce58..3cdf2c9 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -42,9 +42,6 @@
$mbox_name = $IMAP->get_mailbox_name();
- // calculate Etag for this request
- $etag = md5($MESSAGE->uid.$mbox_name.session_id().intval($MESSAGE->headers->mdn_sent).intval($MESSAGE->is_safe).intval($PRINT_MODE));
-
// check known senders to display images
if (!$MESSAGE->is_safe
&& !empty($MESSAGE->sender['mailto'])
@@ -57,6 +54,9 @@
}
}
+ // calculate Etag for this request
+ $etag = md5($MESSAGE->uid.$mbox_name.session_id().intval($MESSAGE->headers->mdn_sent).intval($MESSAGE->is_safe).intval($PRINT_MODE));
+
// allow caching, unless remote images are present
if ((bool)$MESSAGE->is_safe)
send_nocacheing_headers();
--
Gitblit v1.9.1