From f4425436cdafa95bfada575809f6dd60d2df1a5b Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Sat, 15 Nov 2008 14:29:45 +0000
Subject: - don't use SORT when SEARCH is better (sort field not specified)

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

(limited to 'roundcubemail/program/include/rcube_imap.php')

diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php
index 0eb9f7b36..3fe651de6 100644
--- a/roundcubemail/program/include/rcube_imap.php
+++ b/roundcubemail/program/include/rcube_imap.php
@@ -984,9 +984,8 @@ class rcube_imap
    */
   function _search_index($mailbox, $criteria='ALL', $charset=NULL, $sort_field=NULL)
     {
-    if ($this->get_capability('sort'))
+    if ($sort_field && $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);
       }
-- 
cgit v1.2.3