diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/rcube_imap.inc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc index 30e6eb8d2..53cec7a24 100644 --- a/program/include/rcube_imap.inc +++ b/program/include/rcube_imap.inc @@ -856,7 +856,7 @@ class rcube_imap $mailbox = $mbox ? $this->_mod_mailbox($mbox) : $this->mailbox; if ($str && $criteria) { - $criteria .= ' CHARSET UTF-8 "'.UTF7EncodeString($str).'"'; + $criteria = 'CHARSET UTF-8 '.$criteria.' "'.UTF7EncodeString($str).'"'; return $this->_search_index($mailbox, $criteria); } else @@ -876,9 +876,12 @@ class rcube_imap $a_messages = iil_C_Search($this->conn, $mailbox, $criteria); // clean message list (there might be some empty entries) - foreach ($a_messages as $i => $val) - if (empty($val)) - unset($a_messages[$i]); + if (is_array($a_messages)) + { + foreach ($a_messages as $i => $val) + if (empty($val)) + unset($a_messages[$i]); + } return $a_messages; } |