Changeset 4845a1e in github

Timestamp:

Sep 11, 2007 4:45:41 AM (6 years ago)

Author:

thomascube <thomas@…>

Branches:

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

Children:

532844b

Parents:

d7d6638

Message:

Fixed message search issues

Location:

program

Files:

• include/rcube_imap.inc (modified) (3 diffs)
• steps/mail/search.inc (modified) (1 diff)

program/include/rcube_imap.inc

@@ -288 +288 @@
     $this->search_subject = $subject;
     $this->search_string = $str;
-    $this->search_set = is_array($msgs) ? $msgs : NULL;
+    $this->search_set = (array)$msgs;
     $this->search_charset = $charset;
     }
@@ -440 +440 @@
       
     // count search set
-    if ($this->search_set && $mailbox == $this->mailbox && $mode == 'ALL')
-      return count($this->search_set);
+    if ($this->search_string && $mailbox == $this->mailbox && $mode == 'ALL')
+      return count((array)$this->search_set);
 
     $a_mailbox_cache = $this->get_cache('messagecount');
@@ -523 +523 @@
 
     // use saved message set
-    if ($this->search_set && $mailbox == $this->mailbox)
+    if ($this->search_string && $mailbox == $this->mailbox)
       return $this->_list_header_set($mailbox, $this->search_set, $page, $sort_field, $sort_order);
 

program/steps/mail/search.inc

@@ -79 +79 @@
   // Get the headers
   $result_h = $IMAP->list_header_set($mbox, $result, 1, $_SESSION['sort_col'], $_SESSION['sort_order']);
-  $count = count($result_h);
+  $count = $IMAP->messagecount();
 
   // save search results in session