From e20e31016215ae6d1ac759ff448ac9d1d71a7cd1 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 10 Jun 2009 14:13:20 -0400
Subject: [PATCH] - Fix messages searching on MailEnable IMAP (#1485762)
---
CHANGELOG | 1 +
program/include/rcube_imap.php | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 32d65bb..81f69ed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- Fix messages searching on MailEnable IMAP (#1485762)
- Fixed many 'skip_deleted' issues (#1485634)
- Fixed messages list sorting on servers without SORT capability
- Colorized signatures in plain text messages
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 76aa853..e7f72ee 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -963,7 +963,7 @@
// 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 @@
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);
--
Gitblit v1.9.1