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

Conflicts:

	plugins/acl/acl.php
	plugins/acl/package.xml
	program/include/rcube_imap.php

1 files changed, 7 insertions, 6 deletions

diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index b2e5b8d47..cb47e661b 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -129,8 +129,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;
         }
@@ -140,18 +142,17 @@ class acl extends rcube_plugin
             return $args;
         }
 */
-        // Namespace root
-        if ($args['options']['is_root']) {
-            return $args;
-        }
-
         // Get MYRIGHTS
+<<<<<<< HEAD
         if (!($myrights = $args['options']['rights'])) {
             return $args;
         }
 
         // Do nothing if no ACL support
         if (!$this->rc->imap->get_capability('ACL')) {
+=======
+        if (empty($myrights)) {
+>>>>>>> e4c9942... Fix handling of MYRIGHTS on private namespace roots - fixes issue where
             return $args;
         }