From fe74db631139f4b387f14ae04b967a4658c0edcb Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sun, 24 Feb 2019 15:15:25 +0100 Subject: [PATCH] Fixing https://github.com/friendica/friendica/issues/6338#issuecomment-458030934 --- mod/display.php | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/mod/display.php b/mod/display.php index 2e931e068..6723a77e9 100644 --- a/mod/display.php +++ b/mod/display.php @@ -19,10 +19,10 @@ use Friendica\Model\Contact; use Friendica\Model\Group; use Friendica\Model\Item; use Friendica\Model\Profile; +use Friendica\Module\Objects; use Friendica\Protocol\ActivityPub; use Friendica\Protocol\DFRN; use Friendica\Util\Strings; -use Friendica\Module\Objects; function display_init(App $a) { @@ -283,22 +283,25 @@ function display_content(App $a, $update = false, $update_uid = 0) $is_remote_contact = false; $item_uid = local_user(); - $parent = Item::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]); - if (DBA::isResult($parent)) { - $a->profile['uid'] = defaults($a->profile, 'uid', $parent['uid']); - $a->profile['profile_uid'] = defaults($a->profile, 'profile_uid', $parent['uid']); - $is_remote_contact = Contact::isFollower(remote_user(), $a->profile['profile_uid']); - } + if (isset($item_parent_uri)) { + $parent = Item::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]); + if (DBA::isResult($parent)) { + $a->profile['uid'] = defaults($a->profile, 'uid', $parent['uid']); + $a->profile['profile_uid'] = defaults($a->profile, 'profile_uid', $parent['uid']); + $is_remote_contact = Contact::isFollower(remote_user(), $a->profile['profile_uid']); - if ($is_remote_contact) { - $cdata = Contact::getPublicAndUserContacID(remote_user(), $a->profile['profile_uid']); - if (!empty($cdata['user'])) { - $groups = Group::getIdsByContactId($cdata['user']); - $remote_cid = $cdata['user']; - $item_uid = $parent['uid']; + if ($is_remote_contact) { + $cdata = Contact::getPublicAndUserContacID(remote_user(), $a->profile['profile_uid']); + if (!empty($cdata['user'])) { + $groups = Group::getIdsByContactId($cdata['user']); + $remote_cid = $cdata['user']; + $item_uid = $parent['uid']; + } + } } } + $page_contact = DBA::selectFirst('contact', [], ['self' => true, 'uid' => $a->profile['uid']]); if (DBA::isResult($page_contact)) { $a->page_contact = $page_contact;