From: Jan Schneider <jan@horde.org>
Date: Mon, 13 Sep 2010 12:37:42 +0000 (+0200)
Subject: There are no authentication drivers providing 'groups' capabilities,
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f870124fe894dec8040ddcc7a5b99565fab006cf;p=horde.git

There are no authentication drivers providing 'groups' capabilities,
and even if there were some, we still want to use the configured
groups backend.
---

diff --git a/framework/Group/lib/Horde/Group.php b/framework/Group/lib/Horde/Group.php
index 302f9d766..a9a5eacbc 100644
--- a/framework/Group/lib/Horde/Group.php
+++ b/framework/Group/lib/Horde/Group.php
@@ -142,18 +142,8 @@ class Horde_Group
             return $group;
         }
 
-        $group_driver = null;
-        $group_params = null;
-        $auth = $GLOBALS['injector']->getInstance('Horde_Auth')->getAuth();
-        if ($auth->hasCapability('groups')) {
-            $group_driver = $auth->getDriver();
-            $group_params = $auth;
-        } elseif (!empty($GLOBALS['conf']['group']['driver']) &&
-                  $GLOBALS['conf']['group']['driver'] != 'datatree') {
-            $group_driver = $GLOBALS['conf']['group']['driver'];
-            $group_params = Horde::getDriverConfig('group', $group_driver);
-        }
-
+        $group_driver = $GLOBALS['conf']['group']['driver'];
+        $group_params = Horde::getDriverConfig('group', $group_driver);
         self::_loadDriver($group_driver);
 
         $group = null;