From 4f2d81edf383b57c81faa8fc3f41d75f34c08bc8 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 15 May 2006 16:54:33 -0400
Subject: [PATCH] Fixed search bugs
---
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 30e6eb8..53cec7a 100644
--- a/program/include/rcube_imap.inc
+++ b/program/include/rcube_imap.inc
@@ -856,7 +856,7 @@
$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 @@
$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;
}
--
Gitblit v1.9.1