X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fgroup.php;h=a1375e00dfa678f18368a407583d9d96e0625916;hb=c5f2157eb2914de06ae098907b1dfb68fc4d03e3;hp=fd1c97dfde47d1af8c665b03eac51370428a7940;hpb=540d2171349ebbb630ceb2f369c7737bd4c329d3;p=friendica.git

diff --git a/include/group.php b/include/group.php
index fd1c97dfde..a1375e00df 100644
--- a/include/group.php
+++ b/include/group.php
@@ -297,17 +297,26 @@ function group_side($every="contacts",$each="group",$editmode = "standard", $gro
 	return $o;
 }
 
-function expand_groups($a,$check_dead = false) {
+function expand_groups($a,$check_dead = false, $use_gcontact = false) {
 	if(! (is_array($a) && count($a)))
 		return array();
 	$groups = implode(',', $a);
 	$groups = dbesc($groups);
-	$r = q("SELECT `contact-id` FROM `group_member` WHERE `gid` IN ( $groups )");
+
+	if ($use_gcontact)
+		$r = q("SELECT `gcontact`.`id` AS `contact-id` FROM `group_member`
+				INNER JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id`
+				INNER JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl`
+			WHERE `gid` IN ($groups)");
+	else
+		$r = q("SELECT `contact-id` FROM `group_member` WHERE `gid` IN ( $groups )");
+
+
 	$ret = array();
 	if(count($r))
 		foreach($r as $rr)
 			$ret[] = $rr['contact-id'];
-	if($check_dead) {
+	if($check_dead AND !$use_gcontact) {
 		require_once('include/acl_selectors.php');
 		$ret = prune_deadguys($ret);
 	}
@@ -366,4 +375,4 @@ function groups_count_unseen() {
 	);
 
 	return $r;
-}
\ No newline at end of file
+}