From 82775db0a4aba866898bcab01e90feaae3f56c99 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 27 Jan 2012 13:16:40 -0500
Subject: [PATCH] - Revert SORT=DISPLAY support, removed by mistake (#1488327)
---
CHANGELOG | 1 +
program/include/rcube_imap_generic.php | 5 +++++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index f0e8830..2f8a627 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Revert SORT=DISPLAY support, removed by mistake (#1488327)
- Add lost translation label in de_DE (#1488315)
- Fix drafts update issues when edited from preview pane (#1488314)
- Fix wrong variable name in rcube_ldap.php (#1488302)
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index 9421121..e390b24 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -1557,6 +1557,11 @@
}
if (!$this->select($mailbox)) {
+ }
+
+ // RFC 5957: SORT=DISPLAY
+ if (($field == 'FROM' || $field == 'TO') && $this->getCapability('SORT=DISPLAY')) {
+ $field = 'DISPLAY' . $field;
return null;
}
--
Gitblit v1.9.1