diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-12-21 18:54:47 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-12-21 18:54:47 +0000 |
| commit | ded4c7c6a34c9779d12555765d13d91ccd3e637e (patch) | |
| tree | aafdbd7fa382433923d3d19a76c9446d7bef8f96 | |
| parent | 9a88ba3f690d1e40166caf4fcd11986be407386c (diff) | |
- Fix searching on IMAP servers without CHARSET specifier support (#1488271)
git-svn-id: https://svn.roundcube.net/trunk@5637 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_imap.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 8513bb0cc..d1b2351ab 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix searching on IMAP servers without CHARSET specifier support (#1488271) - Fix expanding folders during drag&drop (#1488260) - Deprecate $DB, $USER, $IMAP global variables, Use $RCMAIL instead - Add option to set default font for HTML message (#1484137) diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php index 60cc41506..2a2f203e9 100644 --- a/roundcubemail/program/include/rcube_imap.php +++ b/roundcubemail/program/include/rcube_imap.php @@ -1470,7 +1470,7 @@ class rcube_imap // Error, try with US-ASCII (some servers may support only US-ASCII) if ($messages->isError() && $charset && $charset != 'US-ASCII') $messages = $this->conn->search($mailbox, - 'CHARSET US-ASCII ' . $this->convert_criteria($criteria, $charset), true); + $this->convert_criteria($criteria, $charset), true); $this->search_sorted = false; |