From ceff79b14a856a91a627b1a4a5eba445c862351b Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 8 Apr 2014 08:53:43 +0200
Subject: Fix bug where "With attachment" option in search filter wasn't
 selected after return from mail view (#1489774)

Conflicts:

	CHANGELOG
---
 program/steps/mail/func.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'program')

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);
     }
-- 
cgit v1.2.3