From 7dfb1fba5001299300736e6b5d95d9400575e3e7 Mon Sep 17 00:00:00 2001 From: thomascube <thomas@roundcube.net> Date: Thu, 18 Sep 2008 14:59:02 -0400 Subject: [PATCH] Set the right number of arguments for setcookie() --- program/steps/mail/search.inc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc index a3f6dda..66fcf47 100644 --- a/program/steps/mail/search.inc +++ b/program/steps/mail/search.inc @@ -64,7 +64,8 @@ // search in subject and sender by default else { - $subject = array("HEADER SUBJECT", "HEADER FROM"); + $from = ($mbox == $CONFIG['sent_mbox'] || $mbox == $CONFIG['drafts_mbox']) ? "TO" : "FROM"; + $subject = array("HEADER SUBJECT", "HEADER $from"); $search = trim($str); } @@ -88,6 +89,7 @@ if ($result_h != NULL) { $_SESSION['search'][$search_request] = $IMAP->get_search_set(); + $_SESSION['last_text_search'] = $str; rcmail_js_message_list($result_h); $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $count)); } @@ -106,4 +108,4 @@ $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count, 1)); $OUTPUT->send(); -?> \ No newline at end of file +?> -- Gitblit v1.9.1