From: Michael <heluecht@pirati.ca>
Date: Wed, 16 Jun 2021 21:01:20 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/2021.06-rc' into public-timeline
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ebd4f59d02a503defef22202bbc3a9d0b1be4655;p=friendica.git

Merge remote-tracking branch 'upstream/2021.06-rc' into public-timeline
---

ebd4f59d02a503defef22202bbc3a9d0b1be4655
diff --cc src/Module/Api/Mastodon/Timelines/PublicTimeline.php
index a00c67e6ad,bc617b65a8..a00d51a605
--- a/src/Module/Api/Mastodon/Timelines/PublicTimeline.php
+++ b/src/Module/Api/Mastodon/Timelines/PublicTimeline.php
@@@ -99,7 -99,8 +99,8 @@@ class PublicTimeline extends BaseAp
  
  		$statuses = [];
  		while ($item = Post::fetch($items)) {
+ 			self::setBoundaries($item['uri-id']);
 -			$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $item['uid']);
 +			$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid);
  		}
  		DBA::close($items);