- make searching aware of 'skip_deleted'

15 years ago · 384d83adb9
parent ec5d2e78a4
commit 384d83adb9
1 changed files with 3 additions and 0 deletions
--- a/program/include/rcube_imap.php
+++ b/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;