summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-09-14 14:31:39 +0200
committerAleksander Machniak <alec@alec.pl>2012-09-14 14:31:39 +0200
commitd409a545c2ec28b57711c4a6ee6f66b4916932b7 (patch)
tree9e69ff298cafbe78c1abca0aa6491e1c85f89712 /program/include
parentbf1d94076ddf79df7787f89ff373666d6fbcf30f (diff)
parentc563c2cc26bd947a5ccee6cae13dc11047d69f09 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Conflicts: CHANGELOG
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_imap.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 0b2f84d4f..ebf31d578 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -3297,11 +3297,8 @@ class rcube_imap extends rcube_storage
}
// Get folder rights (MYRIGHTS)
- if ($acl && !$options['noselect']) {
- // skip shared roots
- if (!$options['is_root'] || $options['namespace'] == 'personal') {
- $options['rights'] = (array)$this->my_rights($folder);
- }
+ if ($acl && ($rights = $this->my_rights($folder))) {
+ $options['rights'] = $rights;
}
// Set 'norename' flag