diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-12-17 13:09:57 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-12-17 13:09:57 +0100 |
| commit | cc5e4452db98bae796b344e8ab5d6cde0bd3c965 (patch) | |
| tree | 83b053ff7c8a5dd2158f0b86f677715e3aaa9e3a | |
| parent | 217a1fce531145e3f90cb9a35c632255b302c8a2 (diff) | |
Read page and page_size before check_recent hook is executed
- some plugins may change them to invalid values (in mail context)
| -rw-r--r-- | program/steps/mail/check_recent.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc index b95819415..4e3b15648 100644 --- a/program/steps/mail/check_recent.inc +++ b/program/steps/mail/check_recent.inc @@ -28,6 +28,8 @@ if (empty($_POST['_folderlist']) && empty($_POST['_list'])) { $trash = $RCMAIL->config->get('trash_mbox'); $current = $RCMAIL->storage->get_folder(); $check_all = $RCMAIL->action != 'refresh' || (bool)$RCMAIL->config->get('check_all_folders'); +$page = $RCMAIL->storage->get_page(); +$page_size = $RCMAIL->storage->get_pagesize(); $search_request = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC); if ($search_request && $_SESSION['search_request'] != $search_request) { @@ -97,8 +99,6 @@ foreach ($a_mailboxes as $mbox_name) { // did a refresh but only in list mode $list_mode = $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL'; $all_count = $RCMAIL->storage->count($mbox_name, $list_mode, $list_mode == 'THREADS', false); - $page = $RCMAIL->storage->get_page(); - $page_size = $RCMAIL->storage->get_pagesize(); // check current page if we're not on the first page if ($all_count && $page > 1) { |