improvements

diff --git a/src/Model/FSuggest.php b/src/Model/FSuggest.php
index e7b8df7e272afe957e5a720c7849332b9586f9ac..a910eb30c252402ed39ed0965f4e4f862e923093 100644 (file)
--- a/src/Model/FSuggest.php
+++ b/src/Model/FSuggest.php
@@ -5,7 +5,7 @@ namespace Friendica\Model;
 use Friendica\BaseModel;
 
 /**
- * Model for interacting with a friend suggest
+ * Model for interacting with a friend suggestion
  *
  * @property int uid
  * @property int cid

diff --git a/src/Module/FriendSuggest.php b/src/Module/FriendSuggest.php
index b2a76300a443587909ef277691b5c8eec1118e48..dcb93ee7eb982f8768677e886f6612141dce5849 100644 (file)
--- a/src/Module/FriendSuggest.php
+++ b/src/Module/FriendSuggest.php
@@ -76,7 +76,15 @@ class FriendSuggest extends BaseModule
                }
 
                $contacts = ContactModel::selectToArray(['id', 'name'], [
-                       '`uid` = ? AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND NOT `deleted` AND `notify` != "" AND `id` != ? AND `network` = ?',
+                       '`uid` = ? 
+                       AND `id` != ? 
+                       AND `network` = ? 
+                       AND NOT `self` 
+                       AND NOT `blocked` 
+                       AND NOT `pending` 
+                       AND NOT `archive` 
+                       AND NOT `deleted` 
+                       AND `notify` != ""',
                        local_user(),
                        $cid,
                        Protocol::DFRN,

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index d611c54c96649fb02b928599e27b266d0bc1a0eb..85098d1deba46c711335d0c8c308d507c5609753 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -71,9 +71,6 @@ class Notifier
                        }
                } elseif ($cmd == Delivery::SUGGESTION) {
                        $suggest = DI::fsuggest()->getById($target_id);
-                       if (empty($suggest)) {
-                               return;
-                       }
                        $uid = $suggest->uid;
                        $recipients[] = $suggest->cid;
                } elseif ($cmd == Delivery::REMOVAL) {