From 77327e252a116030349a0d59643b73311566e996 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 28 Oct 2010 07:34:27 +0000
Subject: - Add SORT=DISPLAY support (RFC 5957)

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

diff --git a/CHANGELOG b/CHANGELOG
index 2eb108514..99e34b81d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -53,6 +53,7 @@ CHANGELOG Roundcube Webmail
 - Don't list subscribed but non-existent folders (#1486225)
 - Fix handling of URLs with tilde (~) or semicolon (;) character (#1487087, #1487088)
 - Plugin API: added 'contact_form' hook
+- Add SORT=DISPLAY support (RFC 5957)
 
 RELEASE 0.4.2
 -------------
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index 2171e5d5d..7917d7889 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -1000,6 +1000,11 @@ class rcube_imap_generic
 	        return false;
 	    }
 
+        // RFC 5957: SORT=DISPLAY
+        if (($field == 'FROM' || $field == 'TO') && $this->getCapability('SORT=DISPLAY')) {
+            $field = 'DISPLAY' . $field;
+        }
+
 	    // message IDs
 	    if (is_array($add))
 		    $add = $this->compressMessageSet(join(',', $add));
-- 
cgit v1.2.3