From 3c71c67118ab81208d0b47519c31d58b6d5ffff0 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 27 Jan 2012 13:15:26 -0500
Subject: [PATCH] - Revert SORT=DISPLAY support, removed by mistake in r4160 (#1488327)
---
CHANGELOG | 1 +
program/include/rcube_imap_generic.php | 5 +++++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 39d1a5b..56755cd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Revert SORT=DISPLAY support, removed by mistake (#1488327)
- Fix autoselect_host() for login (#1488297)
- Fix drafts update issues when edited from preview pane (#1488314)
- Changed license to GNU GPLv3+ with exceptions for skins & plugins
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index 1832215..ba71a67 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -1559,6 +1559,11 @@
return new rcube_result_index($mailbox);
}
+ // RFC 5957: SORT=DISPLAY
+ if (($field == 'FROM' || $field == 'TO') && $this->getCapability('SORT=DISPLAY')) {
+ $field = 'DISPLAY' . $field;
+ }
+
// message IDs
if (!empty($add))
$add = $this->compressMessageSet($add);
--
Gitblit v1.9.1