- Minimize session data size by storing only last search result

  and by removing search result from session after listing with empty search filter


git-svn-id: https://svn.roundcube.net/trunk@4084 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 4 insertions, 5 deletions

diff --git a/roundcubemail/program/steps/mail/search.inc b/roundcubemail/program/steps/mail/search.inc
index 1fc74dfe5..db46ce428 100644
--- a/roundcubemail/program/steps/mail/search.inc
+++ b/roundcubemail/program/steps/mail/search.inc
@@ -111,19 +111,18 @@ if (!is_array($_SESSION['search']))
   $_SESSION['search'] = array();
 
 if ($search_str) {
-  $_SESSION['search'][$search_request] = $IMAP->get_search_set();
+  $_SESSION['search'] = $IMAP->get_search_set();
   $_SESSION['last_text_search'] = $str;
 }
+$_SESSION['search_request'] = $search_request;
 
 // Make sure we got the headers
-if (!empty($result_h))
-{
+if (!empty($result_h)) {
   rcmail_js_message_list($result_h);
   if ($search_str)
     $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $IMAP->messagecount(NULL, 'ALL')));
 }
-else
-{
+else {
   $OUTPUT->show_message('searchnomatch', 'notice');
 }