modified html_link to redirect output to view_text.

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

diff --git a/functions/attachment_common.php b/functions/attachment_common.php
index a6251442d6a5e824c178b091dbeccbe4077d980a..3ee385a362a7b402ae7ec95525234cb97ba64383 100644 (file)
--- a/functions/attachment_common.php
+++ b/functions/attachment_common.php
@@ -130,14 +130,13 @@ function attachment_common_link_message(&$Args)
 
 function attachment_common_link_html(&$Args)
 {
-    $Args[1]['attachment_common']['href'] = '../src/download.php?startMessage=' . 
-        $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]) {
-        $Args[1]['attachment_common']['href'] .= '&where=' . 
-        urlencode($Args[8]) . '&what=' . urlencode($Args[9]);
-    }
+    global $QUERY_STRING;
+    $Args[1]['attachment_common']['href'] = '../src/view_text.php?'. $QUERY_STRING.
+       /* why use the overridetype? can this be removed */
+       '&override_type0=text&override_type1=html';
+    $Args[1]['attachment_common']['href'] =
+          set_url_var($Args[1]['attachment_common']['href'], 
+         'ent_id',$Args[5]);
 
     $Args[1]['attachment_common']['text'] = _("view");