From d2fa254d904ac16b8faba723af4f477923324e86 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sat, 29 Jun 2013 17:11:24 +0200 Subject: Fix messages list sorting with THREAD=REFS Conflicts: CHANGELOG --- CHANGELOG | 1 + program/lib/Roundcube/rcube_imap.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index c411bee71..f0014178c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix messages list sorting with THREAD=REFS - Remove deprecated (in PHP 5.5) PREG /e modifier usage (#1489174) - Fix empty messages list when register_globals is enabled (#1489157) - Fix so valid and set date.timezone is not required by installer checks (#1489180) diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php index a323a84e4..869fa9eea 100644 --- a/program/lib/Roundcube/rcube_imap.php +++ b/program/lib/Roundcube/rcube_imap.php @@ -1336,7 +1336,7 @@ class rcube_imap extends rcube_storage // THREAD=REFERENCES: sorting by sent date of root message // THREAD=REFS: sorting by the most recent date in each thread - if ($this->get_capability('THREAD') != 'REFS') { + if ($this->threading != 'REFS') { $sortby = $this->sort_field ? $this->sort_field : 'date'; $index = $this->index_direct($this->folder, $sortby, $this->sort_order, false); -- cgit v1.2.3