X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fimage.php;h=776549db8118e25506c5abf3c5276d1f8800757d;hp=4cad2b0037f5119c1f9f5b119b37fd01ac59e504;hb=24d1619523e7005477feb74d9a54da6a0efc58a6;hpb=5be9f1952729e353cf3a2b8431e432254b879b15

diff --git a/src/image.php b/src/image.php
index 4cad2b00..776549db 100644
--- a/src/image.php
+++ b/src/image.php
@@ -14,6 +14,7 @@
 require_once('../src/validate.php');
 require_once('../functions/date.php');
 require_once('../functions/page_header.php');
+require_once('../functions/html.php');
 require_once('../src/load_prefs.php');
 
 displayPageHeader($color, 'None');
@@ -24,20 +25,15 @@ echo '<BR>' .
     '<TR><TD BGCOLOR="' . $color[0] . '">' .
     '<B><CENTER>' .
     _("Viewing an image attachment") . " - ";
-if (isset($where) && isset($what)) {
-  // from a search
-  echo '<a href="../src/read_body.php?mailbox=' . urlencode($mailbox) .
-        '&passed_id=' . $passed_id . '&where=' . urlencode($where) . 
-        '&what=' . urlencode($what). '">' . _("View message") . '</a>';
-} else {   
-  echo '<a href="../src/read_body.php?mailbox=' . urlencode($mailbox) .
-       '&passed_id=' . $passed_id . '&startMessage=' . $startMessage .
-       '&show_more=0">' . _("View message") . '</a>';
-}   
+
+$msg_url = 'read_body.php?' . $QUERY_STRING;
+$msg_url = set_url_var($msg_url, 'ent_id', 0);
+echo '<a href="'.$msg_url.'">'. _("View message") . '</a>';
+
 
 $DownloadLink = '../src/download.php?passed_id=' . $passed_id .
-               '&mailbox=' . urlencode($mailbox) . 
-               '&passed_ent_id=' . $passed_ent_id . '&absolute_dl=true';
+               '&amp;mailbox=' . urlencode($mailbox) . 
+               '&amp;ent_id=' . $ent_id . '&amp;absolute_dl=true';
 
 echo '</b></td></tr>' . "\n" .
     '<tr><td align=center><A HREF="' . $DownloadLink . '">' .