From c7357ea32010ecd7f11b8df1e64abece403ec034 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 08 Apr 2014 14:28:14 -0400
Subject: [PATCH] Merge branch 'release-1.0' of github.com:roundcube/roundcubemail into release-1.0
---
CHANGELOG | 2 ++
program/steps/mail/func.inc | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 7c74661..fa65c50 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix bug where "With attachment" option in search filter wasn't selected after return from mail view (#1489774)
+
RELEASE 1.0.0
-------------
- Fix style of disabled protocol handler link on IE (#1489569)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 072ee71..e93e2f6 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1984,7 +1984,7 @@
$ctypes = array('application/', 'multipart/m', 'multipart/signed', 'multipart/report');
// Build search string of "with attachment" filter
- $attachment = str_repeat(' OR', count($ctypes)-1);
+ $attachment = trim(str_repeat(' OR', count($ctypes)-1));
foreach ($ctypes as $type) {
$attachment .= ' HEADER Content-Type ' . rcube_imap_generic::escape($type);
}
--
Gitblit v1.9.1