summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_imap.php6
-rw-r--r--program/include/rcube_imap_generic.php7
2 files changed, 8 insertions, 5 deletions
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 09ea4df5e..55b082048 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -476,11 +476,7 @@ class rcube_imap
$search_str .= " UNSEEN";
// get message count using SEARCH
// not very performant but more precise (using UNDELETED)
- // disable THREADS for this request
- $threads = $this->threading;
- $this->threading = false;
- $index = $this->_search_index($mailbox, $search_str);
- $this->threading = $threads;
+ $index = $this->conn->search($mailbox, $search_str);
$count = is_array($index) ? count($index) : 0;
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index 461beece6..ab37902ae 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -1584,10 +1584,17 @@ class rcube_imap_generic
function search($folder, $criteria, $return_uid=false)
{
+ $old_sel = $this->selected;
+
if (!$this->select($folder)) {
return false;
}
+ // return empty result when folder is empty and we're just after SELECT
+ if ($old_sel != $folder && !$this->exists) {
+ return array();
+ }
+
$data = '';
$query = 'srch1 ' . ($return_uid ? 'UID ' : '') . 'SEARCH ' . chop($criteria);