From 32aeaee3d3844b68cb12b505ef87f3e52a512acb Mon Sep 17 00:00:00 2001 From: thomasb Date: Tue, 11 Sep 2007 08:45:41 +0000 Subject: Fixed message search issues git-svn-id: https://svn.roundcube.net/trunk@791 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_imap.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'roundcubemail/program/include') diff --git a/roundcubemail/program/include/rcube_imap.inc b/roundcubemail/program/include/rcube_imap.inc index 46c0d1aeb..41cc1cca5 100644 --- a/roundcubemail/program/include/rcube_imap.inc +++ b/roundcubemail/program/include/rcube_imap.inc @@ -287,7 +287,7 @@ class rcube_imap $this->search_subject = $subject; $this->search_string = $str; - $this->search_set = is_array($msgs) ? $msgs : NULL; + $this->search_set = (array)$msgs; $this->search_charset = $charset; } @@ -439,8 +439,8 @@ class rcube_imap $mailbox = $this->mailbox; // count search set - if ($this->search_set && $mailbox == $this->mailbox && $mode == 'ALL') - return count($this->search_set); + if ($this->search_string && $mailbox == $this->mailbox && $mode == 'ALL') + return count((array)$this->search_set); $a_mailbox_cache = $this->get_cache('messagecount'); @@ -522,7 +522,7 @@ class rcube_imap return array(); // use saved message set - if ($this->search_set && $mailbox == $this->mailbox) + if ($this->search_string && $mailbox == $this->mailbox) return $this->_list_header_set($mailbox, $this->search_set, $page, $sort_field, $sort_order); if ($sort_field!=NULL) -- cgit v1.2.3