Bugfix for Parameter mismatch

[friendica.git] / src / Model / Contact.php

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index d7f27ddd557fcde3cabafc834d8e891e369b9430..2203b62162372e482e084e5eb0607a4a41b8720f 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -42,7 +42,7 @@ class Contact extends BaseObject
                                INNER JOIN `group_member`
                                        ON `contact`.`id` = `group_member`.`contact-id`
                                WHERE `gid` = ?
-                               AND `group_member`.`uid` = ?
+                               AND `contact`.`uid` = ?
                                AND NOT `contact`.`self`
                                AND NOT `contact`.`blocked`
                                AND NOT `contact`.`pending`
@@ -73,7 +73,7 @@ class Contact extends BaseObject
                                INNER JOIN `group_member`
                                        ON `contact`.`id` = `group_member`.`contact-id`
                                WHERE `gid` = ?
-                               AND `group_member`.`uid` = ?
+                               AND `contact`.`uid` = ?
                                AND `contact`.`network` = ?
                                AND `contact`.`notify` != ""',
                                $gid,
@@ -96,11 +96,11 @@ class Contact extends BaseObject
        public static function createSelfFromUserId($uid)
        {
                // Only create the entry if it doesn't exist yet
-               if (dba::exists('contact', ['uid' => intval($uid), 'self'])) {
+               if (dba::exists('contact', ['uid' => $uid, 'self' => true])) {
                        return true;
                }
 
-               $user = dba::select('user', ['uid', 'username', 'nickname'], ['uid' => intval($uid)], ['limit' => 1]);
+               $user = dba::select('user', ['uid', 'username', 'nickname'], ['uid' => $uid], ['limit' => 1]);
                if (!DBM::is_result($user)) {
                        return false;
                }
@@ -605,7 +605,9 @@ class Contact extends BaseObject
                        AND NOT `pending`
                        AND `id` NOT IN (
                                SELECT DISTINCT(`contact-id`)
-                               FROM `group_member` WHERE `uid` = %d
+                               FROM `group_member`
+                               INNER JOIN `group` ON `group`.`id` = `group_member`.`gid`
+                               WHERE `group`.`uid` = %d
                        )
                        LIMIT %d, %d", intval($uid), intval($uid), intval($start), intval($count)
                );