]> git.mxchange.org Git - friendica.git/commitdiff
Only show incoming pending contact requests with intro
authorMichael <heluecht@pirati.ca>
Mon, 9 Sep 2019 08:58:56 +0000 (08:58 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 9 Sep 2019 08:58:56 +0000 (08:58 +0000)
src/Module/Contact.php

index 331da1281664918f1a7d167d0e85d32688344702..0b27f0e4a37d1a20a3d222174778743fbd5f3897 100644 (file)
@@ -642,8 +642,8 @@ class Contact extends BaseModule
                                $sql_extra = " AND `archive` AND NOT `blocked`";
                                break;
                        case 'pending':
-                               $sql_extra = " AND `pending` AND NOT `archive`
-                                       AND NOT EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id` AND `ignore`)";
+                               $sql_extra = sprintf(" AND `pending` AND NOT `archive` AND ((`rel` = %d)
+                                       OR EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id` AND NOT `ignore`))", Model\Contact::SHARING);
                                break;
                        default:
                                $sql_extra = " AND NOT `archive` AND NOT `blocked` AND NOT `pending`";