From d355c04084d0568908f495c515c09000271ff9aa Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 21 Dec 2011 13:57:01 -0500
Subject: [PATCH] - Backport r5637 fix for searching without CHARSET
---
CHANGELOG | 1 +
program/include/rcube_imap.php | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 26b600b..2fef9b8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 2d7a94f..514d11b 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -1722,7 +1722,7 @@
// 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)
--
Gitblit v1.9.1