summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-06-10 18:13:20 +0000
committeralecpl <alec@alec.pl>2009-06-10 18:13:20 +0000
commite20e31016215ae6d1ac759ff448ac9d1d71a7cd1 (patch)
tree3feece4ff8cc62c41abdb7f7560357c1567e786c /program
parent7c60ffbdaa8df2a4938ca0fb64a2fac79ba96fb6 (diff)
- Fix messages searching on MailEnable IMAP (#1485762)
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_imap.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 76aa853af..e7f72ee13 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -963,7 +963,7 @@ class rcube_imap
// try search with US-ASCII charset (should be supported by server)
// only if UTF-8 search is not supported
- if (empty($results) && !is_array($results) && !empty($charset) && $charset!='US-ASCII')
+ if (empty($results) && !is_array($results) && !empty($charset) && $charset != 'US-ASCII')
{
// convert strings to US_ASCII
if(preg_match_all('/\{([0-9]+)\}\r\n/', $str, $matches, PREG_OFFSET_CAPTURE))
@@ -984,7 +984,7 @@ class rcube_imap
else // strings for conversion not found
$res = $str;
- $results = $this->search($mbox_name, $res, 'US-ASCII', $sort_field);
+ $results = $this->search($mbox_name, $res, NULL, $sort_field);
}
$this->set_search_set($str, $results, $charset, $sort_field);