- Backport r5637 fix for searching without CHARSET

release-0.7
alecpl 13 years ago
parent 984ee8ce92
commit d355c04084

@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
- Fix searching on IMAP servers without CHARSET specifier support (#1488271)
- Fix crash with eAccelerator (#1488256)
- Fix expanding folders during drag&drop (#1488260)
- Fix wrong postgres sequence name in upgrade from 0.6

@ -1722,7 +1722,7 @@ class rcube_imap
// Error, try with US-ASCII (some servers may support only US-ASCII)
if ($a_messages === false && $charset && $charset != 'US-ASCII')
$a_messages = $this->conn->search($mailbox,
'CHARSET US-ASCII ' . $this->convert_criteria($criteria, $charset));
$this->convert_criteria($criteria, $charset));
// I didn't found that SEARCH should return sorted IDs
if (is_array($a_messages) && !$this->sort_field)

Loading…
Cancel
Save