- add 'Deleted' to search filter

git-svn-id: https://svn.roundcube.net/trunk@2616 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 3 insertions, 1 deletions

diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc
index 154fd7e1e..d5f3a6875 100644
--- a/roundcubemail/program/steps/mail/func.inc
+++ b/roundcubemail/program/steps/mail/func.inc
@@ -1446,7 +1446,7 @@ function rcmail_send_mdn($uid)
 
 function rcmail_search_filter($attrib)
 {
-  global $OUTPUT;
+  global $OUTPUT, $CONFIG;
 
   if (!strlen($attrib['id']))
     $attrib['id'] = 'rcmlistfilter';
@@ -1466,6 +1466,8 @@ function rcmail_search_filter($attrib)
   $select_filter->add(rcube_label('unread'), 'UNSEEN');
   $select_filter->add(rcube_label('flagged'), 'FLAGGED');
   $select_filter->add(rcube_label('unanswered'), 'UNANSWERED');
+  if (!$CONFIG['skip_deleted'])
+    $select_filter->add(rcube_label('deleted'), 'DELETED');
 
   $out = $select_filter->show($_SESSION['search_filter']);