From cc57dad1cd7568fc0a7968d419d4dc1258eecb53 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 28 Jun 2012 05:35:56 -0400
Subject: [PATCH] Fix last merge
---
plugins/acl/acl.php | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index cb47e66..07c7b01 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -142,17 +142,8 @@
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;
}
--
Gitblit v1.9.1