Merge branch 'bug-noLocalPosts' of https://github.com/matthiasmoritz/friendica into...

[friendica.git] / src / Module / Profile / Status.php

diff --git a/src/Module/Profile/Status.php b/src/Module/Profile/Status.php
index 5dae349d7fbf643decd205be457fc4deafc57b4c..6543ea1952a98cabb3e371c681a55da385b66168 100644 (file)
--- a/src/Module/Profile/Status.php
+++ b/src/Module/Profile/Status.php
@@ -174,8 +174,8 @@ class Status extends BaseProfile
 
                $condition = DBA::mergeConditions($condition, ["((`gravity` = ? AND `wall`) OR
                        (`gravity` = ? AND `vid` = ? AND `origin`
-                       AND `thr-parent-id` IN (SELECT `uri-id` FROM `post` WHERE `gravity` = ? )))",
-                       Item::GRAVITY_PARENT, Item::GRAVITY_ACTIVITY, Verb::getID(Activity::ANNOUNCE), Item::GRAVITY_PARENT]);
+                       AND `thr-parent-id` IN (SELECT `uri-id` FROM `post` WHERE `gravity` = ? AND `network` IN (?, ?))))",
+                       Item::GRAVITY_PARENT, Item::GRAVITY_ACTIVITY, Verb::getID(Activity::ANNOUNCE), Item::GRAVITY_PARENT, Protocol::ACTIVITYPUB, Protocol::DFRN]);
 
                $condition = DBA::mergeConditions($condition, ['uid' => $profile['uid'], 'network' => Protocol::FEDERATED,
                        'visible' => true, 'deleted' => false]);