From b6e93c83fc9a093c3c87c91440a1f8c65f3e0b3b Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 12 Jun 2019 15:34:56 -0400 Subject: [PATCH 1/2] Suppress undefined index nickname notice in Model\Profile::sidebar --- src/Model/Profile.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 765fed791..4bb886814 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -369,7 +369,9 @@ class Profile if (!$local_user_is_self && $show_connect) { if (!$visitor_is_authenticated) { - $follow_link = 'dfrn_request/' . $profile['nickname']; + if (!empty($profile['nickname'])) { + $follow_link = 'dfrn_request/' . $profile['nickname']; + } } elseif ($profile_is_native) { if ($visitor_is_following) { $unfollow_link = $visitor_base_path . '/unfollow?url=' . urlencode($profile_url); From ab0a3f194a4e3d8d046fcad3db589e005cc1ee73 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 31 Dec 2019 12:20:57 -0500 Subject: [PATCH 2/2] Add necessary call to BaseUrl->get() in Module\Objects - Addresses https://github.com/friendica/friendica/issues/8000#issuecomment-569959500 --- src/Module/Objects.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Module/Objects.php b/src/Module/Objects.php index e03baaad7..783e849bf 100644 --- a/src/Module/Objects.php +++ b/src/Module/Objects.php @@ -37,7 +37,7 @@ class Objects extends BaseModule // If no original post could be found, it could possibly be a forum post, there we remove the "origin" field. // @TODO: Replace with parameter from router $item = Item::selectFirst(['id', 'author-link'], ['guid' => $a->argv[1], 'private' => false]); - if (!DBA::isResult($item) || !strstr($item['author-link'], DI::baseUrl())) { + if (!DBA::isResult($item) || !strstr($item['author-link'], DI::baseUrl()->get())) { throw new \Friendica\Network\HTTPException\NotFoundException(); } }