Bugfix. Show attached images.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2160 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/attachment_common.php b/functions/attachment_common.php
index 1f69325d6e990dde2118fbb0b6bc6e94f00bb751..d89dfe14085417fe8f500a1118d716636bc4f801 100644 (file)
--- a/functions/attachment_common.php
+++ b/functions/attachment_common.php
@@ -133,9 +133,10 @@ function attachment_common_link_html(&$Args)
      $Args[2] . '&passed_id=' . $Args[3] . '&mailbox=' . $Args[4] .
     '&passed_ent_id=' . $Args[5] . '&override_type0=text&override_type1=html';
   
-  if ($Args[8] && $Args[9])
+  if ($Args[8] && $Args[9]) {
      $Args[1]['attachment_common']['href'] .= '&where=' . 
      urlencode($Args[8]) . '&what=' . urlencode($Args[9]);
+  }
 
   $Args[1]['attachment_common']['text'] = _("view");
   
@@ -157,13 +158,15 @@ function attachment_common_link_image(&$Args)
      $Args[2] . '&passed_id=' . $Args[3] . '&mailbox=' . $Args[4] .
      '&passed_ent_id=' . $Args[5];
   
-  if ($Args[8] && $Args[9])
+  if ($Args[8] && $Args[9]) {
      $Args[1]['attachment_common']['href'] .= '&where=' . 
      urlencode($Args[8]) . '&what=' . urlencode($Args[9]);
+  }
 
   $Args[1]['attachment_common']['text'] = _("view");
   
   $Args[6] = $Args[1]['attachment_common']['href'];
+  
 }
 
 

diff --git a/src/read_body.php b/src/read_body.php
index 1199968779df14df6e78f78338897bd75a079f26..866422d54163c0119445eaa163172c725d95fbb6 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -659,9 +659,9 @@ if (($attachment_common_show_images) &&
 
     foreach ($attachment_common_show_images_list as $img) {
         $imgurl = '../src/download.php' .
-                "?startMessage=$startMessage".
-                '&passed_id='     . urlencode($img['passed_id']) .
-                '&mailbox='       . urlencode($img['mailbox']) .
+                '?' . 
+                'passed_id='     . urlencode($img['passed_id']) .
+                '&mailbox='       . urlencode($mailbox) .
                 '&passed_ent_id=' . urlencode($img['ent_id']) .
                 '&absolute_dl=true';