diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-06-10 18:13:20 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-06-10 18:13:20 +0000 |
| commit | 5c248b68423e67343557aa08a14c9f2e12881faf (patch) | |
| tree | 714ef1751351203c3693730ea43af277bef44e97 | |
| parent | eb292f624a697b2ced885977af1cc8b39dccf33a (diff) | |
- Fix messages searching on MailEnable IMAP (#1485762)
git-svn-id: https://svn.roundcube.net/trunk@2632 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_imap.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 32d65bb13..81f69ed19 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/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/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php index 76aa853af..e7f72ee13 100644 --- a/roundcubemail/program/include/rcube_imap.php +++ b/roundcubemail/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); |