- Revert SORT=DISPLAY support, removed by mistake in r4160 (#1488327)

git-svn-id: https://svn.roundcube.net/trunk@5839 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 5 insertions, 0 deletions

diff --git a/roundcubemail/program/include/rcube_imap_generic.php b/roundcubemail/program/include/rcube_imap_generic.php
index 1832215b0..ba71a6744 100644
--- a/roundcubemail/program/include/rcube_imap_generic.php
+++ b/roundcubemail/program/include/rcube_imap_generic.php
@@ -1559,6 +1559,11 @@ class rcube_imap_generic
             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);