diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-09-17 16:46:31 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-09-17 16:46:31 +0000 |
| commit | 68000ee62bccc327ce4b9d90da3d4e6c8bf178f4 (patch) | |
| tree | 947fe761f3bdf863561e0361a1efe95977a36150 | |
| parent | 44451f1330b54dc5999db91e06da742e7663a84d (diff) | |
- Fix locked folder rename option on servers supporting RFC2086 only (#1488089)
git-svn-id: https://svn.roundcube.net/trunk@5232 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_imap.php | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 1d8b0b312..22d2d810c 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix locked folder rename option on servers supporting RFC2086 only (#1488089) - Trigger 'new_messages' hook for all checked folders (#1488083) - Fix session race conditions when composing new messages - Fix encoding of LDAP contacts identifiers (#1488079) diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php index 8c904561d..d9549affd 100644 --- a/roundcubemail/program/include/rcube_imap.php +++ b/roundcubemail/program/include/rcube_imap.php @@ -3500,7 +3500,8 @@ class rcube_imap } if (!empty($options['rights'])) { - $options['norename'] = !in_array('x', $options['rights']); + $options['norename'] = !in_array('x', $options['rights']) && !in_array('d', $options['rights']); + if (!$options['noselect']) { $options['noselect'] = !in_array('r', $options['rights']); } |