From e77712ac0e1fdf7c15b998f26ae9eb1485d569b0 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Mon, 8 Jun 2009 17:45:09 +0000
Subject: - make searching aware of 'skip_deleted'

git-svn-id: https://svn.roundcube.net/trunk@2625 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/rcube_imap.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'roundcubemail/program/include')

diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php
index 7b24d2307..5130cd280 100644
--- a/roundcubemail/program/include/rcube_imap.php
+++ b/roundcubemail/program/include/rcube_imap.php
@@ -1006,6 +1006,9 @@ class rcube_imap
    */
   function _search_index($mailbox, $criteria='ALL', $charset=NULL, $sort_field=NULL)
     {
+    if ($this->skip_deleted && !preg_match('/UNDELETED/', $criteria))
+      $criteria = 'UNDELETED '.$criteria;
+
     if ($sort_field && $this->get_capability('sort'))
       {
       $charset = $charset ? $charset : $this->default_charset;
-- 
cgit v1.2.3