- Fix messages searching on MailEnable IMAP (#1485762)

release-0.6
alecpl 16 years ago
parent 7c60ffbdaa
commit e20e310162

@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail CHANGELOG RoundCube Webmail
=========================== ===========================
- Fix messages searching on MailEnable IMAP (#1485762)
- Fixed many 'skip_deleted' issues (#1485634) - Fixed many 'skip_deleted' issues (#1485634)
- Fixed messages list sorting on servers without SORT capability - Fixed messages list sorting on servers without SORT capability
- Colorized signatures in plain text messages - Colorized signatures in plain text messages

@ -963,7 +963,7 @@ class rcube_imap
// try search with US-ASCII charset (should be supported by server) // try search with US-ASCII charset (should be supported by server)
// only if UTF-8 search is not supported // 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 // convert strings to US_ASCII
if(preg_match_all('/\{([0-9]+)\}\r\n/', $str, $matches, PREG_OFFSET_CAPTURE)) 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 else // strings for conversion not found
$res = $str; $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); $this->set_search_set($str, $results, $charset, $sort_field);

Loading…
Cancel
Save