Changeset 1535 in subversion for trunk/roundcubemail/program/steps/mail/show.inc

Timestamp:

Jun 14, 2008 1:37:29 PM (5 years ago)

Author:

thomasb

Message:

Bugfix: call msg->set_safe() before checking msg->is_save

File:

• trunk/roundcubemail/program/steps/mail/show.inc (modified) (2 diffs)

trunk/roundcubemail/program/steps/mail/show.inc

@@ -43 +43 @@
   $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 
@@ -57 +54 @@
     }
   }
+
+  // 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