summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-10-28 07:34:27 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-10-28 07:34:27 +0000
commit2f787aef3ea80a8be0c1ea4e86b3e755637d15a7 (patch)
treec9f94b7636444e7a82a01a25d739e6ded434ecde
parent7f1794fa401915fdc3a33d40cc30912fe2c794f8 (diff)
- Add SORT=DISPLAY support (RFC 5957)
git-svn-id: https://svn.roundcube.net/trunk@4152 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/CHANGELOG1
-rw-r--r--roundcubemail/program/include/rcube_imap_generic.php5
2 files changed, 6 insertions, 0 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index 2eb108514..99e34b81d 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/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/roundcubemail/program/include/rcube_imap_generic.php b/roundcubemail/program/include/rcube_imap_generic.php
index 2171e5d5d..7917d7889 100644
--- a/roundcubemail/program/include/rcube_imap_generic.php
+++ b/roundcubemail/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));