summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-09-13 20:33:31 +0200
committerAleksander Machniak <alec@alec.pl>2012-09-13 20:33:31 +0200
commit4697c2cb776e1fb5c5dca44baa43733a37b00bcb (patch)
tree927a607735c3c27f7ebf0bc052581f4f15518189
parent41b3fe17824b1c8c00037addc0e9bdbc5506ece9 (diff)
Fix folder creation under public namespace root (#1488665)
-rw-r--r--CHANGELOG1
-rw-r--r--program/include/rcube_imap.php7
2 files changed, 3 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 9c205c61d..8c668da79 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix folder creation under public namespace root (#1488665)
- Fix so "Edit as new" on draft creates a new message (#1488687)
- Fix invalid error message on deleting mail from read only folder (#1488694)
- Fix error where session wasn't updated after folder rename/delete (#1488692)
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