fix for incorrect urlencode.

Thnx Wouter.

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

diff --git a/src/read_body.php b/src/read_body.php
index 5cf701a0315f3c4b42cd81e5b4bf0fd4f9f49ed6..b5d4b4029f03b407b0cf4de1dfbaa02a588e02b6 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -382,8 +382,7 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
           $startMessage, $compose_new_win, $PHP_SELF, $save_as_draft;
 
    $topbar_delimiter = ' | ';
-   $urlMailbox = encodeHeader($mailbox);
-
+   $urlMailbox = urlencode($mailbox);
    $s = '<table width="100%" cellpadding="3" cellspacing="0" align="center"'.
          ' border="0" bgcolor="'.$color[9].'"><tr><td align="left" width="33%"><small>';
 
@@ -502,7 +501,7 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
 function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
    global $QUERY_STRING, $base_uri;
    
-   $urlMailbox = encodeHeader($mailbox);
+   $urlMailbox = urlencode($mailbox);
    $s = '<table width="100%" cellpadding="3" cellspacing="0" align="center"'.
          ' border="0" bgcolor="'.$color[9].'">'. "\n".
         '<tr align="right"><td valign="top" align="right"><small>';
@@ -651,6 +650,7 @@ if (($attachment_common_show_images) &&
 
 do_hook('read_body_bottom');
 do_hook('html_bottom');
+$message->clean_up();
 sqimap_logout($imapConnection);
 ?>
 </body>