Add new module and widget for managing saved searches

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

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 7f31527a2b30efff4766d6b41b02983cd3cab6eb..0b27f0e4a37d1a20a3d222174778743fbd5f3897 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -642,7 +642,8 @@ class Contact extends BaseModule
                                $sql_extra = " AND `archive` AND NOT `blocked`";
                                break;
                        case 'pending':
-                               $sql_extra = " AND `pending` AND NOT `archive`";
+                               $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`";
@@ -993,14 +994,6 @@ class Contact extends BaseModule
                                $alt_text = L10n::t('Pending outgoing contact request');
                        } else {
                                $alt_text = L10n::t('Pending incoming contact request');
-                               $intro = DBA::selectFirst('intro', ['blocked', 'ignore'], ['contact-id' => $rr['id']]);
-                               if (DBA::isResult($intro)) {
-                                       if ($intro['blocked']) {
-                                               $alt_text = L10n::t('Blocked incoming contact request');
-                                       } elseif ($intro['ignore']) {
-                                               $alt_text = L10n::t('Ignored incoming contact request');
-                                       }
-                               }
                        }
                }