Fix: Regression, so introduce option to restore old behaviour.

Dolibarr · Mar 12, 2014 · dd7970b · dd7970b
1 parent e76f217
commit dd7970b
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
@@ -178,9 +178,10 @@ function listGroupsForUser($userid)
 	 * 	Return array of users id for group this->id (or all if this->id not defined)
 	 *
 	 * 	@param	string	$excludefilter		Filter to exclude
+	 *  @param	int		$mode				0=Return array of user instance, 1=Return array of users id only
 	 * 	@return	array 						Array of users
 	 */
-	function listUsersForGroup($excludefilter='')
+	function listUsersForGroup($excludefilter='', $mode=0)
 	{
 		global $conf, $user;
 
@@ -211,11 +212,15 @@ function listUsersForGroup($excludefilter='')
 			{
 				if (! array_key_exists($obj->rowid, $ret))
 				{
-					$newuser=new User($this->db);
-					$newuser->fetch($obj->rowid);
-					$ret[$obj->rowid]=$newuser;
+					if ($mode != 1)
+					{
+						$newuser=new User($this->db);
+						$newuser->fetch($obj->rowid);
+						$ret[$obj->rowid]=$newuser;
+					}
+					else $ret[$obj->rowid]=$obj->rowid;
 				}
-				if (! empty($obj->usergroup_entity))
+				if ($mode != 1 && ! empty($obj->usergroup_entity))
 				{
 					$ret[$obj->rowid]->usergroup_entity[]=$obj->usergroup_entity;
 				}
@@ -744,4 +749,4 @@ function initAsSpecimen()
 	}
 }
 
-?>
+?>