From bba25299f8d1569f560fc66f82837c95145ee121 Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Thu, 22 Sep 2011 03:49:33 -0400 Subject: [PATCH] - Fix bug where after delete message rows can be added to the list of another folder (#1487752) --- program/steps/mail/check_recent.inc | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc index 0eab345..e22cccc 100644 --- a/program/steps/mail/check_recent.inc +++ b/program/steps/mail/check_recent.inc @@ -34,16 +34,24 @@ // check recent/unseen counts foreach ($a_mailboxes as $mbox_name) { + $is_current = $mbox_name == $current; + if ($is_current) { + // Synchronize mailbox cache, handle flag changes + $IMAP->mailbox_sync($mbox_name); + } + + // Get mailbox status $status = $IMAP->mailbox_status($mbox_name); if ($status & 1) { // trigger plugin hook - $RCMAIL->plugins->exec_hook('new_messages', array('mailbox' => $mbox_name)); + $RCMAIL->plugins->exec_hook('new_messages', + array('mailbox' => $mbox_name, 'is_current' => $is_current)); } rcmail_send_unread_count($mbox_name, true); - if ($status && $mbox_name == $current) { + if ($status && $is_current) { // refresh saved search set $search_request = get_input_value('_search', RCUBE_INPUT_GPC); if ($search_request && isset($_SESSION['search']) @@ -73,7 +81,7 @@ $OUTPUT->set_env('messagecount', $all_count); $OUTPUT->set_env('pagecount', ceil($all_count/$IMAP->page_size)); - $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($all_count)); + $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($all_count), $mbox_name); $OUTPUT->set_env('current_page', $all_count ? $IMAP->list_page : 1); // remove old rows (and clear selection if new list is empty) -- Gitblit v1.9.1