Changeset 3d1e777 in github

Timestamp:

Nov 15, 2008 6:48:41 AM (5 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

e2e745f

Parents:

84b884d

Message:

• fix for skip_deleted (#1485553)

File:

• program/include/rcube_imap.php (modified) (1 diff)

program/include/rcube_imap.php

@@ -983 +983 @@
    * @see rcube_imap::search()
    */
-  function _search_index($mailbox, $criteria='ALL', $charset='', $sort_field='')
+  function _search_index($mailbox, $criteria='ALL', $charset=NULL, $sort_field=NULL)
     {
     if ($this->get_capability('sort'))
+      {
+      $sort_field = $sort_field ? $sort_field : $this->sort_field;
+      $charset = $charset ? $charset : $this->default_charset;
       $a_messages = iil_C_Sort($this->conn, $mailbox, $sort_field, $criteria, FALSE, $charset);
+      }
     else
       $a_messages = iil_C_Search($this->conn, $mailbox, ($charset ? "CHARSET $charset " : '') . $criteria);