summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-04-08 20:28:14 +0200
committerAleksander Machniak <alec@alec.pl>2014-04-08 20:28:14 +0200
commitc7357ea32010ecd7f11b8df1e64abece403ec034 (patch)
tree007a288d57c81bc4ebd124ff0defaee5beacfefa
parentd22d119e3819b9c6722a751ba8fe64de3a9aeb5a (diff)
parentceff79b14a856a91a627b1a4a5eba445c862351b (diff)
Merge branch 'release-1.0' of github.com:roundcube/roundcubemail into release-1.0
-rw-r--r--CHANGELOG2
-rw-r--r--program/steps/mail/func.inc2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7c74661ca..fa65c50b9 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 072ee716c..e93e2f600 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1984,7 +1984,7 @@ function rcmail_search_filter($attrib)
$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);
}