[jan] Give administrators access to all groups, even with $conf['shar…

…e']['any_group'] disabled.
horde · Jun 15, 2015 · 7912d2d · 7912d2d
1 parent 402f484
commit 7912d2d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/framework/Core/lib/Horde/Core/Ajax/Application/Handler/Groups.php b/framework/Core/lib/Horde/Core/Ajax/Application/Handler/Groups.php
@@ -28,7 +28,8 @@ public function listGroups()
         try {
             $groups = $GLOBALS['injector']
                 ->getInstance('Horde_Group')
-                ->listAll(empty($GLOBALS['conf']['share']['any_group'])
+                ->listAll(empty($GLOBALS['conf']['share']['any_group']) &&
+                          !$GLOBALS['registry']->isAdmin()
                           ? $GLOBALS['registry']->getAuth()
                           : null);
             if ($groups) {

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
@@ -39,7 +39,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [jan] Give administrators access to all groups, even with $conf[&apos;share&apos;][&apos;any_group&apos;] disabled.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -3963,7 +3963,7 @@
    <date>2015-06-11</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [jan] Give administrators access to all groups, even with $conf[&apos;share&apos;][&apos;any_group&apos;] disabled.
    </notes>
   </release>
  </changelog>