NO it's not a habit from me.

[squirrelmail.git] / functions / mime.php

diff --git a/functions/mime.php b/functions/mime.php
index 6e7bbe553c809155fa24311068c0e711114d900e..1419d58854dd7a859d3140abc07a842c07a9886a 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -456,7 +456,7 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) {
                      . "&passed_id=$id&mailbox=$urlMailbox"
                      . '&ent_id='.$ent.$passed_ent_id_link;
         if ($where && $what) {
-           $defaultlink = '&where='. urlencode($where).'&what='.urlencode($what);
+           $defaultlink .= '&where='. urlencode($where).'&what='.urlencode($what);
         }
         /* This executes the attachment hook with a specific MIME-type.
          * If that doesn't have results, it tries if there's a rule
@@ -1496,7 +1496,9 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX'){
                       "html",
                       "head",
                       "base",
-                      "link"
+                      "link",
+                     "frame",
+                     "iframe"
                       );
 
     $rm_tags_with_content = Array(