summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2007-09-11 08:45:41 +0000
committerthomascube <thomas@roundcube.net>2007-09-11 08:45:41 +0000
commit4845a1ea952f4affda3546abd7dfa02d24fc818c (patch)
tree04ab216dfb7a1a1436b0835aa873f1c106d6105e /program/include
parentd7d66380f0f9f3a0a3dba3a7e298b1d094105ac0 (diff)
Fixed message search issues
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_imap.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index 46c0d1aeb..41cc1cca5 100644
--- a/program/include/rcube_imap.inc
+++ b/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)