Fixed bugs in rcube_db and rcube_imap classes

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

1 files changed, 2 insertions, 1 deletions

diff --git a/roundcubemail/program/include/rcube_imap.inc b/roundcubemail/program/include/rcube_imap.inc
index 9e1fc8cab..9f249d57b 100644
--- a/roundcubemail/program/include/rcube_imap.inc
+++ b/roundcubemail/program/include/rcube_imap.inc
@@ -878,7 +878,8 @@ class rcube_imap
       {
       $results = array();
       foreach ($criteria as $crit)
-        $results = array_merge($results, $this->search($mbox_name, $crit, $str, $charset));
+        if ($search_result = $this->search($mbox_name, $crit, $str, $charset))
+          $results = array_merge($results, $search_result);
       
       $results = array_unique($results);
       $this->set_search_set($criteria, $str, $results, $charset);