Merge branch 'friendica:develop' into mastodon-api-reshare-fixes

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

diff --git a/src/Model/Post.php b/src/Model/Post.php
index 770ab083178f41b3ee8d3a14021bbb433581ca33..9e137ae379496f54895ee79e372aad8be4baf011 100644 (file)
--- a/src/Model/Post.php
+++ b/src/Model/Post.php
@@ -263,7 +263,10 @@ class Post
                        return $result;
                }
 
-               return self::selectFirst($original_fields, ['uri-id' => $result['thr-parent-id'], 'uid' => [0, $result['uid']]], $params);
+               $final_query_condition = ['uri-id' => $result['thr-parent-id']];
+               $final_query_condition = DBA::mergeConditions($final_query_condition, ['uid != 0']);
+               $final_params          = ['order' => ['id']];
+               return self::selectFirst($original_fields, $final_query_condition, $final_params);
        }
 
        /**