Make ORDEREDSUBJECT the default thread algorithm

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Base.php b/framework/Imap_Client/lib/Horde/Imap/Client/Base.php
index 920c14a..e7355de 100644 (file)
--- a/framework/Imap_Client/lib/Horde/Imap/Client/Base.php
+++ b/framework/Imap_Client/lib/Horde/Imap/Client/Base.php
@@ -1481,6 +1481,7 @@ abstract class Horde_Imap_Client_Base
      *              Horde_Imap_Client::THREAD_REFS. Additionally, other
      *              algorithms can be explicitly specified by passing the IMAP
      *              thread algorithm in as a string.
+     *              DEFAULT: Horde_Imap_Client::THREAD_ORDEREDSUBJECT
      * 'search' - (object) The search query (a
      *            Horde_Imap_Client_Search_Query object).
      *            DEFAULT: All messages in mailbox included in thread sort.
@@ -1523,7 +1524,7 @@ abstract class Horde_Imap_Client_Base
     /**
      * Thread sort a given list of messages (RFC 5256).
      *
-     * @param array $options  Additional options.
+     * @param array $options  Additional options. See thread().
      *
      * @return array  An array with the following values, one per message,
      *                with the key being either the UID (default) or the

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
index 741324c..3714ec7 100644 (file)
--- a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
+++ b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
@@ -2014,7 +2014,7 @@ class Horde_Imap_Client_Socket extends Horde_Imap_Client_Base
 
         $tsort = (isset($options['criteria']))
             ? (is_string($options['criteria']) ? strtoupper($options['criteria']) : $thread_criteria[$options['criteria']])
-            : 'REFERENCES';
+            : 'ORDEREDSUBJECT';
 
         $cap = $this->queryCapability('THREAD');
         if (!$cap || !in_array($tsort, $cap)) {