Changeset 6118 in subversion

Timestamp:

Apr 23, 2012 5:22:15 AM (13 months ago)

Author:

alec

Message:

• Fix parsing ESEARCH (ALL) result and enabling ESEARCH for ordinary searches

Location:

trunk/roundcubemail/program/include

Files:

• rcube_imap_generic.php (modified) (1 diff)
• rcube_result_index.php (modified) (2 diffs)

trunk/roundcubemail/program/include/rcube_imap_generic.php

@@ -1612 +1612 @@
         // If ESEARCH is supported always use ALL
         // but not when items are specified or using simple id2uid search
-        if (empty($items) && ((int) $criteria != $criteria)) {
+        if (empty($items) && preg_match('/[^0-9]/', $criteria)) {
             $items = array('ALL');
         }

trunk/roundcubemail/program/include/rcube_result_index.php

@@ -101 +101 @@
 // @TODO: work with compressed result?!
                     if (isset($this->params['ALL'])) {
-                        $data[$idx] = implode(self::SEPARATOR_ELEMENT,
+                        $data_item = implode(self::SEPARATOR_ELEMENT,
                             rcube_imap_generic::uncompressMessageSet($this->params['ALL']));
                     }
@@ -111 +111 @@
             unset($data[$i]);
         }
+
+        $data = array_filter($data);
 
         if (empty($data)) {