Changeset a039c62 in github


Ignore:
Timestamp:
Mar 4, 2010 9:39:47 AM (3 years ago)
Author:
alecpl <alec@…>
Branches:
master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8
Children:
f1ce516
Parents:
bbc8565
Message:
  • Fix deleting all messages from last list page (#1486293)
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • CHANGELOG

    rbbc8565 ra039c62  
    22=========================== 
    33 
     4- Fix deleting all messages from last list page (#1486293) 
    45- Flag original messages when sending a draft (#1486203) 
    56- Changed signature separator when top-posting (#1486330) 

  • program/steps/mail/mark.inc

    rcbeea3d ra039c62  
    8282 
    8383      // jump back one page (user removed the whole last page) 
    84       if ($IMAP->list_page > 1 && $nextpage_count <= 0 && $remaining == 0) { 
     84      if ($IMAP->list_page > 1 && $remaining == 0) { 
    8585        $IMAP->set_page($IMAP->list_page-1); 
    8686        $_SESSION['page'] = $IMAP->list_page; 
    … …  
    9797      $unseen_count = $msg_count ? $IMAP->messagecount($mbox, 'UNSEEN') : 0; 
    9898      $old_unseen = $_SESSION['unseen_count'][$mbox]; 
     99 
    99100      if ($old_unseen != $unseen_count) { 
    100101        $OUTPUT->command('set_unread_count', $mbox, $unseen_count, ($mbox == 'INBOX')); 
    … …  
    108109        $sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : $CONFIG['message_sort_order']; 
    109110   
    110         $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order, $count); 
     111        $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order, 
     112          $jump_back ? NULL : $count); 
    111113       
    112114        rcmail_js_message_list($a_headers, false, false); 

  • program/steps/mail/move_del.inc

    r5b3ed54 ra039c62  
    8989 
    9090  // jump back one page (user removed the whole last page) 
    91   if ($IMAP->list_page > 1 && $nextpage_count <= 0 && $remaining == 0) { 
     91  if ($IMAP->list_page > 1 && $remaining == 0) { 
    9292    $IMAP->set_page($IMAP->list_page-1); 
    9393    $_SESSION['page'] = $IMAP->list_page; 
    … …  
    122122    $sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : $CONFIG['message_sort_order']; 
    123123 
    124     $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order, $count); 
     124    $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order, 
     125      $jump_back ? NULL : $count); 
    125126 
    126127    rcmail_js_message_list($a_headers, false, false); 
Note: See TracChangeset for help on using the changeset viewer.