summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-04-08 08:53:43 +0200
committerAleksander Machniak <alec@alec.pl>2014-04-08 08:53:43 +0200
commit0ccef59cfa1bf4b87fe616d94abab59f10d6717a (patch)
treef32a2e0bd4a16d9a1ee699815da8d8b1c39050ba
parentd2eb687b45cce68812574d440cb3f65ecb415f87 (diff)
Fix bug where "With attachment" option in search filter wasn't selected after return from mail view (#1489774)
-rw-r--r--CHANGELOG1
-rw-r--r--program/steps/mail/func.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 75e2b69ec..43cf899e2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ CHANGELOG Roundcube Webmail
- Set In-Reply-To and References for forwarded messages (#1489593)
- Removed redundant default_folders config option (#1489737)
- Implemented IMAP SPECIAL-USE extension support [RFC6154] (#1487830)
+- Fix bug where "With attachment" option in search filter wasn't selected after return from mail view (#1489774)
RELEASE 1.0.0
-------------
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 7adc06550..58f529f94 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -2036,7 +2036,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);
}