Changeset 2635 in subversion

Timestamp:

Jun 11, 2009 4:40:39 AM (4 years ago)

Author:

alec

Message:

• fix marking as DELETED with skip_deleted enabled

File:

• trunk/roundcubemail/program/steps/mail/mark.inc (modified) (2 diffs)

trunk/roundcubemail/program/steps/mail/mark.inc

@@ -30 +30 @@
 {
   $flag = $a_flags_map[$flag] ? $a_flags_map[$flag] : strtoupper($flag);
+
+  if ($flag == 'DELETED' && $CONFIG['skip_deleted'] && $_POST['_from'] != 'show') {
+    // count messages before changing anything
+    $old_count = $IMAP->messagecount();
+    $old_pages = ceil($old_count / $IMAP->page_size);
+    $count = sizeof(explode(',', $uids));
+  }
+
   $marked = $IMAP->set_flag($uids, $flag);
   
@@ -60 +68 @@
         $OUTPUT->command('command', 'list');
     } else {
-      // count messages before changing anything
-      $old_count = $IMAP->messagecount();
-      $old_pages = ceil($old_count / $IMAP->page_size);
-
       // refresh saved search set after moving some messages
       if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && $IMAP->search_set) {