Merge pull request #133 from cwickert/release-0.9-canned-responses

Thomas B.

2013-10-07 a3b85d7b8560cdc1057fcaffa3acbd247b4b5b7a

 program/steps/mail/mark.inc

@@ -16,9 +16,6 @@
 +-----------------------------------------------------------------------+
 | Author: Thomas Bruederli <roundcube@gmail.com>                        |
 +-----------------------------------------------------------------------+

 $Id$

*/

// only process ajax requests
@@ -116,24 +113,21 @@
      $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count), $mbox);

      if ($threading) {
       $count = get_input_value('_count', RCUBE_INPUT_POST);
        $count = get_input_value('_count', RCUBE_INPUT_POST);
      }

      // add new rows from next page (if any)
      if ($count && $uids != '*' && ($jump_back || $nextpage_count > 0)) {
        $sort_col   = isset($_SESSION['sort_col'])   ? $_SESSION['sort_col']   : $CONFIG['message_sort_col'];
        $sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : $CONFIG['message_sort_order'];

        $a_headers = $RCMAIL->storage->list_messages($mbox, NULL, $sort_col, $sort_order,
       $jump_back ? NULL : $count);
        $a_headers = $RCMAIL->storage->list_messages($mbox, NULL,
          rcmail_sort_column(), rcmail_sort_order(), $jump_back ? NULL : $count);

        rcmail_js_message_list($a_headers, false);
      }
    }
  }

  $OUTPUT->send();
}
else {
    $OUTPUT->show_message('internalerror', 'error');
}

exit;

$OUTPUT->send();