From e841c4ce760437b181f0ec1bdab5d0ba2446be64 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 25 Mar 2010 08:50:48 +0000
Subject: [PATCH] "calling split_accounts with 'merge' it type is NOT either
 'accounts' or 'groups'"

---
 phpgwapi/inc/class.accounts.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.accounts.inc.php b/phpgwapi/inc/class.accounts.inc.php
index 8b35975591..d9e4d6f178 100644
--- a/phpgwapi/inc/class.accounts.inc.php
+++ b/phpgwapi/inc/class.accounts.inc.php
@@ -289,7 +289,8 @@ class accounts
 			$valid = array();
 			if ($app)
 			{
-				$valid = $this->split_accounts($app,$param['type'] == 'both' ? 'merge' : $param['type']);
+				// we want the result merged, whatever it takes, as we only care for the ids
+				$valid = $this->split_accounts($app,!in_array($param['type'],array('accounts','groups')) ? 'merge' : $param['type']);
 			}
 			if ($group)
 			{