No implicit mention for top level Diaspora comments

[friendica.git] / src / Object / Post.php

diff --git a/src/Object/Post.php b/src/Object/Post.php
index d2c0b31e102b436e60adb731fb4ff93bba94d662..156b602e90575b5e8c1eb07a2d4ce29cf85871a0 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -881,13 +881,13 @@ class Post
                        return '';
                }
 
-               $item = PostModel::selectFirst(['author-addr', 'uri-id'], ['id' => $this->getId()]);
+               $item = PostModel::selectFirst(['author-addr', 'uri-id', 'network', 'gravity'], ['id' => $this->getId()]);
                if (!DBA::isResult($item) || empty($item['author-addr'])) {
                        // Should not happen
                        return '';
                }
 
-               if ($item['author-addr'] != $owner['addr']) {
+               if (($item['author-addr'] != $owner['addr']) && (($item['gravity'] != GRAVITY_PARENT) || !in_array($item['network'], [Protocol::DIASPORA]))) {
                        $text = '@' . $item['author-addr'] . ' ';
                } else {
                        $text = '';