X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGroup.php;h=71f794118940f2032bdf59fac3e1cb44c2c7043b;hb=dc3d2d598820d7a8682f55dd0d84a8f6ecabaaa1;hp=b01fc197014ad2ce9684ce4b05d39cc6bd1afc94;hpb=ecea7425f8ad11ace4af39d476919e3203bff44f;p=friendica.git

diff --git a/src/Model/Group.php b/src/Model/Group.php
index b01fc19701..71f7941189 100644
--- a/src/Model/Group.php
+++ b/src/Model/Group.php
@@ -273,36 +273,25 @@ class Group extends BaseObject
 	 *
 	 * @param array $group_ids
 	 * @param boolean $check_dead
-	 * @param boolean $use_gcontact
 	 * @return array
 	 */
-	public static function expand($group_ids, $check_dead = false, $use_gcontact = false)
+	public static function expand($group_ids, $check_dead = false)
 	{
 		if (!is_array($group_ids) || !count($group_ids)) {
 			return [];
 		}
 
-		$condition = '`gid` IN (' . substr(str_repeat("?, ", count($group_ids)), 0, -2) . ')';
-		if ($use_gcontact) {
-			$sql = '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 ' . $condition;
-			$param_arr = array_merge([$sql], $group_ids);
-			$stmt = call_user_func_array('dba::p', $param_arr);
-		} else {
-			$condition_array = array_merge([$condition], $group_ids);
-			$stmt = DBA::select('group_member', ['contact-id'], $condition_array);
-		}
+		$stmt = DBA::select('group_member', ['contact-id'], ['gid' => $group_ids]);
 
 		$return = [];
 		while($group_member = DBA::fetch($stmt)) {
 			$return[] = $group_member['contact-id'];
 		}
 
-		if ($check_dead && !$use_gcontact) {
+		if ($check_dead) {
 			Contact::pruneUnavailable($return);
 		}
+
 		return $return;
 	}