[Svn] r6117 - trunk/roundcubemail/program/include

trac at roundcube.net trac at roundcube.net
Mon Apr 23 11:03:54 CEST 2012


Author: alec
Date: 2012-04-23 04:03:54 -0500 (Mon, 23 Apr 2012)
New Revision: 6117

Modified:
   trunk/roundcubemail/program/include/rcube_imap.php
Log:
- Fix listing messages when: skip_deleted=true, ESEARCH supported, threads disabled


Modified: trunk/roundcubemail/program/include/rcube_imap.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_imap.php	2012-04-23 08:22:13 UTC (rev 6116)
+++ trunk/roundcubemail/program/include/rcube_imap.php	2012-04-23 09:03:54 UTC (rev 6117)
@@ -1213,7 +1213,9 @@
         }
         // use message index sort as default sorting
         else if (!$sort_field) {
+            // use search result from count() if possible
             if ($this->options['skip_deleted'] && !empty($this->icache['undeleted_idx'])
+                && $this->icache['undeleted_idx']->get_parameters('ALL') !== null
                 && $this->icache['undeleted_idx']->get_parameters('MAILBOX') == $folder
             ) {
                 $index = $this->icache['undeleted_idx'];



More information about the svn mailing list