From b866a27364a66c436156732553b1fa638e046b8b Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 28 Jun 2012 04:43:50 -0400
Subject: [PATCH] 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).
---
plugins/acl/acl.php | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index ab981ab..8709f0b 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -128,8 +128,10 @@
*/
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 @@
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;
}
--
Gitblit v1.9.1