X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGroup.php;h=db9ec331e46f34bede096b71443e5fc0a69f6836;hb=045a0b2a007d869fc141f3f4a7a1761589565fdf;hp=26bab7f45bca4b5828e5a5f3d4936c4658fbb0cb;hpb=0dbf7a2611a7c2471617b614903411876b9f3c06;p=friendica.git

diff --git a/src/Model/Group.php b/src/Model/Group.php
index 26bab7f45b..db9ec331e4 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';
 
 /**
@@ -60,7 +61,7 @@ class Group extends BaseObject
 	 * @param int $cid
 	 * @return array
 	 */
-	private static function getIdsByContactId($cid)
+	public static function getIdsByContactId($cid)
 	{
 		$condition = ['contact-id' => $cid];
 		$stmt = dba::select('group_member', ['gid'], $condition);
@@ -98,7 +99,6 @@ class Group extends BaseObject
 				FROM `group`
 				WHERE `group`.`uid` = ?;",
 			local_user(),
-			local_user(),
 			local_user()
 		);
 
@@ -131,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) {
@@ -139,8 +139,13 @@ class Group extends BaseObject
 			return false;
 		}
 
+		$group = dba::select('group', ['uid'], ['gid' => $gid], ['limit' => 1]);
+		if (!DBM::is_result($group)) {
+			return false;
+		}
+
 		// remove group from default posting lists
-		$user = dba::select('user', ['def_gid', 'allow_gid', 'deny_gid'], ['uid' => $uid], ['limit' => 1]);
+		$user = dba::select('user', ['def_gid', 'allow_gid', 'deny_gid'], ['uid' => $group['uid']], ['limit' => 1]);
 		if (DBM::is_result($user)) {
 			$change = false;
 
@@ -158,7 +163,7 @@ class Group extends BaseObject
 			}
 
 			if ($change) {
-				dba::update('user', $user, ['uid' => $uid]);
+				dba::update('user', $user, ['uid' => $group['uid']]);
 			}
 		}
 
@@ -176,9 +181,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;