diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-01-27 18:15:26 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-01-27 18:15:26 +0000 |
| commit | 64089813495a58af19f657b5010a53883a37befa (patch) | |
| tree | 1cde1e3d4c7895dd57db0553bdad865d028fdcb4 | |
| parent | e1ca1bd39c0970c5d7e75bedb038c64e1d4f57ca (diff) | |
- Revert SORT=DISPLAY support, removed by mistake in r4160 (#1488327)
git-svn-id: https://svn.roundcube.net/trunk@5839 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_imap_generic.php | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 39d1a5b59..56755cd05 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Revert SORT=DISPLAY support, removed by mistake (#1488327) - Fix autoselect_host() for login (#1488297) - Fix drafts update issues when edited from preview pane (#1488314) - Changed license to GNU GPLv3+ with exceptions for skins & plugins 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); |