diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-06-28 10:43:50 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-06-28 11:21:16 +0200 |
| commit | e4c9942543d23f8462e125f25665c6fab0f9c93f (patch) | |
| tree | 22a6b85253332978eaa0c4a6cf2efe11f96adccb /plugins | |
| parent | 1d0c3f557585a7d1ab319455a5af288f82fedf75 (diff) | |
Fix handling of MYRIGHTS on private namespace roots - fixes issue where
in ACL plugin it wasn't possible to share INBOX folder (when it was a namespace prefix).
Conflicts:
program/include/rcube_imap.php
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/acl/acl.php | 16 | ||||
| -rw-r--r-- | plugins/acl/package.xml | 4 |
2 files changed, 6 insertions, 14 deletions
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php index ab981ab89..8709f0b00 100644 --- a/plugins/acl/acl.php +++ b/plugins/acl/acl.php @@ -128,8 +128,10 @@ class acl extends rcube_plugin */ function folder_form($args) { - // Edited folder name (empty in create-folder mode) $mbox_imap = $args['options']['name']; + $myrights = $args['options']['rights']; + + // Edited folder name (empty in create-folder mode) if (!strlen($mbox_imap)) { return $args; } @@ -139,18 +141,8 @@ class acl extends rcube_plugin return $args; } */ - // Namespace root - if ($args['options']['is_root']) { - return $args; - } - // Get MYRIGHTS - if (!($myrights = $args['options']['rights'])) { - return $args; - } - - // Do nothing if no ACL support - if (!$this->rc->storage->get_capability('ACL')) { + if (empty($myrights)) { return $args; } diff --git a/plugins/acl/package.xml b/plugins/acl/package.xml index 7ea0f3297..5f8638474 100644 --- a/plugins/acl/package.xml +++ b/plugins/acl/package.xml @@ -13,9 +13,9 @@ <email>alec@alec.pl</email> <active>yes</active> </lead> - <date>2012-03-13</date> + <date>2012-06-28</date> <version> - <release>0.8</release> + <release>0.9</release> <api>0.7</api> </version> <stability> |