From c886de7ff41b8e0495e3c89a0b5912a6ec5c44d2 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 21 Dec 2011 13:54:47 -0500
Subject: [PATCH] - Fix searching on IMAP servers without CHARSET specifier support (#1488271)
---
CHANGELOG | 1 +
program/include/rcube_imap.php | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 8513bb0..d1b2351 100644
--- a/CHANGELOG
+++ b/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/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 60cc415..2a2f203 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -1470,7 +1470,7 @@
// 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;
--
Gitblit v1.9.1