From: Marc G. K. <st...@us...> - 2002-05-17 12:10:16
|
Update of /cvsroot/squirrelmail/squirrelmail/src In directory usw-pr-cvs1:/tmp/cvs-serv17829 Modified Files: search.php Log Message: Fix for Forward messages from a search Index: search.php =================================================================== RCS file: /cvsroot/squirrelmail/squirrelmail/src/search.php,v retrieving revision 1.62 retrieving revision 1.63 diff -u -w -r1.62 -r1.63 --- search.php 16 May 2002 12:17:49 -0000 1.62 +++ search.php 17 May 2002 12:10:14 -0000 1.63 @@ -12,7 +12,6 @@ require_once('../src/validate.php'); require_once('../functions/imap.php'); require_once('../functions/imap_search.php'); -require_once('../functions/imap_utf7_decode_local.php'); require_once('../functions/array.php'); require_once('../functions/strings.php'); @@ -181,8 +180,11 @@ $search_all = 'all'; } +if (isset($composenew) && $composenew) { + displayPageHeader($color, $mailbox, 'comp_in_new();'); +} else { displayPageHeader($color, $mailbox); - +} /* See how the page was called and fire off correct function */ if ((!isset($submit) || empty($submit)) && !empty($what)) { $submit = _("Search"); @@ -308,8 +310,7 @@ for ($i = 0; $i < count($boxes); $i++) { if (!in_array('noselect', $boxes[$i]['flags'])) { $box = $boxes[$i]['unformatted']; - $box2 = imap_utf7_decode_local( - str_replace(' ', ' ', $boxes[$i]['unformatted-disp'])); + $box2 = str_replace(' ', ' ', $boxes[$i]['unformatted-disp']); if( $box2 == 'INBOX' ) { $box2 = _("INBOX"); } |