Fix bug where drag-n-drop element could be empty after check-recent a…

…ction
roundcube · Jan 19, 2017 · f789cb5 · f789cb5
1 parent f4b57ba
commit f789cb5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
@@ -450,7 +450,7 @@ function rcmail_js_message_list($a_headers, $insert_top=false, $a_show_cols=null
     $a_headers   = $plugin['messages'];
 
     if ($RCMAIL->config->get('layout', 'widescreen') == 'widescreen') {
-        if (!$OUTPUT->get_env('threading')) {
+        if (!$RCMAIL->storage->get_threading()) {
             if (($idx = array_search('threads', $a_show_cols)) !== false) {
                 unset($a_show_cols[$idx]);
             }

diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
@@ -157,10 +157,6 @@ $_SESSION['search_scope']    = $scope;
 $_SESSION['search_interval'] = $interval;
 $_SESSION['search_filter']   = $filter;
 
-$OUTPUT->set_env('search_request', $search_str ? $search_request : '');
-$OUTPUT->set_env('search_filter', $_SESSION['search_filter']);
-$OUTPUT->set_env('threading', $RCMAIL->storage->get_threading());
-
 // Get the headers
 if (!$result->incomplete) {
     $result_h = $RCMAIL->storage->list_messages($mbox, 1, $sort_column, rcmail_sort_order());
@@ -205,6 +201,8 @@ else {
 }
 
 // update message count display
+$OUTPUT->set_env('search_request', $search_str ? $search_request : '');
+$OUTPUT->set_env('search_filter', $_SESSION['search_filter']);
 $OUTPUT->set_env('messagecount', $count);
 $OUTPUT->set_env('pagecount', ceil($count/$RCMAIL->storage->get_pagesize()));
 $OUTPUT->set_env('exists', $mbox === null ? 0 : $RCMAIL->storage->count($mbox, 'EXISTS'));