From 82775db0a4aba866898bcab01e90feaae3f56c99 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 27 Jan 2012 18:16:40 +0000
Subject: - Revert SORT=DISPLAY support, removed by mistake (#1488327)

---
 CHANGELOG                              | 1 +
 program/include/rcube_imap_generic.php | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index f0e8830d6..2f8a627c2 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 94211210d..e390b2448 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -1557,6 +1557,11 @@ class rcube_imap_generic
         }
 
         if (!$this->select($mailbox)) {
+        }
+
+        // RFC 5957: SORT=DISPLAY
+        if (($field == 'FROM' || $field == 'TO') && $this->getCapability('SORT=DISPLAY')) {
+            $field = 'DISPLAY' . $field;
             return null;
         }
 
-- 
cgit v1.2.3