summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-06-14 17:37:29 +0000
committerthomascube <thomas@roundcube.net>2008-06-14 17:37:29 +0000
commited42ff12e76fd626d6348665cc28415fcc052715 (patch)
treef463d4fe61801e207817d0de1c18eb7b5df30119
parent62e43d2c1a61d26f9a07419f7155a2881cb57332 (diff)
Bugfix: call msg->set_safe() before checking msg->is_save
-rw-r--r--program/steps/mail/show.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 8b6ce5809..3cdf2c9a5 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -42,9 +42,6 @@ if ($_GET['_uid']) {
$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 @@ if ($_GET['_uid']) {
}
}
+ // 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();