From 789094695a51304ad7db3d10e192ce31937cc602 Mon Sep 17 00:00:00 2001
From: jangliss <jangliss@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 26 Apr 2004 23:55:21 +0000
Subject: [PATCH] Fix the link here for search strings

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7272 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 src/read_body.php | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/read_body.php b/src/read_body.php
index 3e431c64..77f34d87 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -733,14 +733,22 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
 }
 
 function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
-    global $base_uri;
-
+    global $base_uri, $where, $what;
+ 
     $urlMailbox = urlencode($mailbox);
-    if (!sqgetGlobalVar('QUERY_STRING', $query_string, SQ_SERVER)) {
-        // FIX ME !. If this happens there is something else wrong. Falling
-        // back to '' won't help. We should raise an error instead.
-        $query_string = '';                                                                                                         
-    } 
+    $urlPassed_id = urlencode($passed_id);
+    $urlPassed_ent_id = urlencode($passed_ent_id);
+ 
+    $query_string = 'mailbox=' . $urlMailbox . '&amp;passed_id=' . $urlPassed_id . '&amp;passed_ent_id=' . $urlPassed_ent_id;
+ 
+    if (!empty($where)) {
+        $query_string .= '&amp;where=' . urlencode($where);
+    }
+
+    if (!empty($what)) {
+        $query_string .= '&amp;what=' . urlencode($what);
+    }
+
     $url = $base_uri.'src/view_header.php?'.$query_string;
 
     $s  = "<TR>\n" .
-- 
2.25.1