[jan] Don't show ACL context menu if ACL preferences are locked.

horde · Jun 10, 2015 · 3590000 · 3590000
1 parent 0c5c958
commit 3590000
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/imp/lib/Dynamic/Mailbox.php b/imp/lib/Dynamic/Mailbox.php
@@ -411,6 +411,11 @@ protected function _addMailboxVars()
                 $context['ctx_mbox']['search']
             );
         }
+        if ($prefs->isLocked('acl')) {
+            unset(
+                $context['ctx_mbox']['_sub2']
+            );
+        }
 
         /* Other Actions context menu. */
         $context['ctx_oa'] = array(

diff --git a/imp/package.xml b/imp/package.xml
@@ -33,6 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
+* [jan] Don&apos;t show ACL context menu if ACL preferences are locked.
 * [jan] Fix redirecting in smartmobile mode (Bug #14002).
 * [jan] Fix address autocompletion in redirection window of smartmobile mode (Bug #14002).
 * [jan] Fix setting single recipients in redirection window in basic mode (Bug #14002).
@@ -3848,6 +3849,7 @@
    <date>2015-04-28</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [jan] Don&apos;t show ACL context menu if ACL preferences are locked.
 * [jan] Fix redirecting in smartmobile mode (Bug #14002).
 * [jan] Fix address autocompletion in redirection window of smartmobile mode (Bug #14002).
 * [jan] Fix setting single recipients in redirection window in basic mode (Bug #14002).