summaryrefslogtreecommitdiff
path: root/roundcubemail/program
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-06-08 17:45:09 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-06-08 17:45:09 +0000
commite77712ac0e1fdf7c15b998f26ae9eb1485d569b0 (patch)
tree117675e225f6a923625150c708b8982c324c897c /roundcubemail/program
parentac25a538143e4e8aa3e35a50b5afdc6503d256e9 (diff)
- make searching aware of 'skip_deleted'
git-svn-id: https://svn.roundcube.net/trunk@2625 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
-rw-r--r--roundcubemail/program/include/rcube_imap.php3
1 files changed, 3 insertions, 0 deletions
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;