From e8be3ed748bdbcd5329b7affdd72e4319f3e5a04 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 9 Jun 2006 03:19:54 +0000
Subject: [PATCH] fixing the fix: -2 has nothing to do with the default group,
 it is the id for the default prefs

---
 setup/inc/class.setup.inc.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/setup/inc/class.setup.inc.php b/setup/inc/class.setup.inc.php
index 44b581e830..f8bb255e6a 100644
--- a/setup/inc/class.setup.inc.php
+++ b/setup/inc/class.setup.inc.php
@@ -923,13 +923,10 @@
 				{
 					return false;
 				}
-				$memberships = array();
 			}
-			else
-			{
-				$memberships = $GLOBALS['egw']->accounts->memberships($accountid);
-			}
-			if($groupid)
+			$memberships = $GLOBALS['egw']->accounts->memberships($accountid,true);
+
+			if($groupid && !in_array($groupid,$memberships))
 			{
 				$memberships[] = $groupid;