X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGroup.php;h=410f78b1564216ffb2dbd1ecd599ffccb3970492;hb=916236ce2fe2c0e9e48d000c6d665f96fecf00a9;hp=cdc2a821d081ca2f93da0829c571d16afd397831;hpb=72641e86a816fea4b727a943fa2edd16c12a3caf;p=friendica.git

diff --git a/src/Model/Group.php b/src/Model/Group.php
index cdc2a821d0..410f78b156 100644
--- a/src/Model/Group.php
+++ b/src/Model/Group.php
@@ -11,6 +11,7 @@ use Friendica\Database\DBM;
 use dba;
 
 require_once 'boot.php';
+require_once 'include/dba.php';
 require_once 'include/text.php';
 
 /**
@@ -57,15 +58,12 @@ class Group extends BaseObject
 	/**
 	 * @brief Get a list of group ids a contact belongs to
 	 *
-	 * @todo Get rid of $uid, the contact id already bears the information
-	 *
-	 * @param int $uid
 	 * @param int $cid
 	 * @return array
 	 */
-	private static function getByContactIdForUserId($uid, $cid)
+	private static function getIdsByContactId($cid)
 	{
-		$condition = ['uid' => $uid, 'contact-id' => $cid];
+		$condition = ['contact-id' => $cid];
 		$stmt = dba::select('group_member', ['gid'], $condition);
 
 		$return = [];
@@ -96,13 +94,11 @@ class Group extends BaseObject
 					AND `contact-id` IN
 						(SELECT `contact-id`
 						FROM `group_member`
-						WHERE `group_member`.`gid` = `group`.`id`
-						AND `group_member`.`uid` = ?)
+						WHERE `group_member`.`gid` = `group`.`id`)
 					) AS `count`
 				FROM `group`
 				WHERE `group`.`uid` = ?;",
 			local_user(),
-			local_user(),
 			local_user()
 		);
 
@@ -135,7 +131,7 @@ class Group extends BaseObject
 	/**
 	 * @brief Mark a group as deleted
 	 *
-	 * @param type $gid
+	 * @param int $gid
 	 * @return boolean
 	 */
 	public static function remove($gid) {
@@ -180,9 +176,9 @@ class Group extends BaseObject
 	 *
 	 * @deprecated Use Group::remove instead
 	 *
-	 * @param type $uid
-	 * @param type $name
-	 * @return type
+	 * @param int $uid
+	 * @param string $name
+	 * @return bool
 	 */
 	public static function removeByName($uid, $name) {
 		$return = false;
@@ -370,7 +366,7 @@ class Group extends BaseObject
 
 		$member_of = array();
 		if ($cid) {
-			$member_of = self::getByContactIdForUserId(local_user(), $cid);
+			$member_of = self::getIdsByContactId($cid);
 		}
 
 		while ($group = dba::fetch($stmt)) {