summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-06-28 11:35:56 +0200
committerAleksander Machniak <alec@alec.pl>2012-06-28 11:35:56 +0200
commitcc57dad1cd7568fc0a7968d419d4dc1258eecb53 (patch)
tree569cb89b38c4910b5993784c81273b1f316c20fa /plugins
parent9899abc36caf00ed2a054b309607aa868e314e07 (diff)
Fix last merge
Diffstat (limited to 'plugins')
-rw-r--r--plugins/acl/acl.php11
1 files changed, 1 insertions, 10 deletions
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index cb47e661b..07c7b018f 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -142,17 +142,8 @@ class acl extends rcube_plugin
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')) {
-=======
+ // Check if myrights is set
if (empty($myrights)) {
->>>>>>> e4c9942... Fix handling of MYRIGHTS on private namespace roots - fixes issue where
return $args;
}