From cc57dad1cd7568fc0a7968d419d4dc1258eecb53 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 28 Jun 2012 11:35:56 +0200
Subject: Fix last merge

---
 plugins/acl/acl.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'plugins')

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;
         }
 
-- 
cgit v1.2.3