diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 765fed791a..4bb886814d 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); diff --git a/src/Module/Objects.php b/src/Module/Objects.php index e03baaad7e..783e849bfe 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(); } }