- Fixed issues with big memory allocation of IMAP results, improved a lot of rcube_imap class

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

1 files changed, 6 insertions, 4 deletions

diff --git a/roundcubemail/program/steps/mail/search.inc b/roundcubemail/program/steps/mail/search.inc
index 49f31e0c1..05ba9d23e 100644
--- a/roundcubemail/program/steps/mail/search.inc
+++ b/roundcubemail/program/steps/mail/search.inc
@@ -109,10 +109,6 @@ $search_str = trim($search_str);
 if ($search_str)
   $IMAP->search($mbox, $search_str, $imap_charset, $_SESSION['sort_col']);
 
-// Get the headers
-$result_h = $IMAP->list_headers($mbox, 1, $_SESSION['sort_col'], $_SESSION['sort_order']);
-$count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
-
 // save search results in session
 if (!is_array($_SESSION['search']))
   $_SESSION['search'] = array();
@@ -123,6 +119,12 @@ if ($search_str) {
 }
 $_SESSION['search_request'] = $search_request;
 
+
+// Get the headers
+$result_h = $IMAP->list_headers($mbox, 1, $_SESSION['sort_col'], $_SESSION['sort_order']);
+$count = $IMAP->messagecount($mbox, $IMAP->threading ? 'THREADS' : 'ALL');
+
+
 // Make sure we got the headers
 if (!empty($result_h)) {
   rcmail_js_message_list($result_h);