From 63d6e6dfc35e6d82c4a64f37c408794c163becd4 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 28 Sep 2011 15:16:41 -0400
Subject: [PATCH] Bump versions to 0.6 stable

---
 program/steps/mail/check_recent.inc |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc
index eb58831..d79359f 100644
--- a/program/steps/mail/check_recent.inc
+++ b/program/steps/mail/check_recent.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/check_recent.inc                                   |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -24,7 +24,7 @@
 
 // list of folders to check
 if ($check_all) {
-    $a_mailboxes = $IMAP->list_mailboxes();
+    $a_mailboxes = $IMAP->list_mailboxes('', '*', 'mail');
 }
 else {
     $a_mailboxes = (array) $current;
@@ -40,8 +40,10 @@
 
         // refresh saved search set
         $search_request = get_input_value('_search', RCUBE_INPUT_GPC);
-        if ($search_request && isset($_SESSION['search'][$search_request])) {
-            $_SESSION['search'][$search_request] = $IMAP->refresh_search();
+        if ($search_request && isset($_SESSION['search'])
+            && $_SESSION['search_request'] == $search_request
+        ) {
+            $_SESSION['search'] = $IMAP->refresh_search();
         }
 
         if (!empty($_GET['_quota']))
@@ -69,8 +71,6 @@
         $OUTPUT->set_env('current_page', $all_count ? $IMAP->list_page : 1);
 
         if ($status & 1) {
-            if ($RCMAIL->config->get('focus_on_new_message', true))
-                $OUTPUT->command('new_message_focus');
             // trigger plugin hook
             $RCMAIL->plugins->exec_hook('new_messages', array('mailbox' => $mbox_name));
         }
@@ -91,4 +91,6 @@
     }
 }
 
+$RCMAIL->plugins->exec_hook('keep_alive', array());
+
 $OUTPUT->send();

--
Gitblit v1.9.1