From: Michael <heluecht@pirati.ca>
Date: Tue, 25 Oct 2022 08:31:01 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into share-rework
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1a0b63659b0bbab0c09e579ef89f2e5eb25fbb3c;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into share-rework
---

1a0b63659b0bbab0c09e579ef89f2e5eb25fbb3c
diff --cc mod/display.php
index fd508fcfc2,4a48eb839c..41c4cc3b9a
--- a/mod/display.php
+++ b/mod/display.php
@@@ -123,9 -122,11 +122,9 @@@ function display_init(App $a
  
  function display_fetchauthor($item)
  {
 -	if (Diaspora::isReshare($item['body'], true)) {
 -		$shared = Item::getShareArray($item);
 -		if (!empty($shared['profile'])) {
 -			$contact = Contact::getByURLForUser($shared['profile'], DI::userSession()->getLocalUserId());
 -		}
 +	$shared = Item::getShareArray($item);
 +	if (empty($shared['comment']) && !empty($shared['guid']) && !empty($shared['profile'])) {
- 		$contact = Contact::getByURLForUser($shared['profile'], Session::getLocalUser());
++		$contact = Contact::getByURLForUser($shared['profile'], DI::userSession()->getLocalUserId());
  	}
  
  	if (empty($contact)) {