diff --git a/mod/newmember.php b/mod/newmember.php
index c2ffe6464..b1eda7a2d 100644
--- a/mod/newmember.php
+++ b/mod/newmember.php
@@ -15,7 +15,7 @@ function newmember_content(App $a)
$o .= L10n::t('We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear.');
$o .= '
' . L10n::t('Getting Started') . '
';
$o .= '
';
- $o .= '
' . '' . L10n::t('Friendica Walk-Through') . ' ' . L10n::t('On your Quick Start page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join.') . '
' . EOL;
+ $o .= '
' . '' . L10n::t('Friendica Walk-Through') . ' ' . L10n::t('On your Quick Start page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join.') . '
' . EOL;
$o .= '
';
$o .= '
' . L10n::t('Settings') . '
';
$o .= '
';
diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index 3f8aea0d0..558b27491 100644
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -31,9 +31,14 @@ class Objects extends BaseModule
/// @todo Add Authentication to enable fetching of non public content
// $requester = HTTPSignature::getSigner('', $_SERVER);
+ // At first we try the original post with that guid
$item = Item::selectFirst(['id'], ['guid' => $a->argv[1], 'origin' => true, 'private' => false]);
if (!DBA::isResult($item)) {
- System::httpExit(404);
+ // If no original post could be found, it could possibly be a forum post, there we remove the "origin" field.
+ $item = Item::selectFirst(['id', 'author-link'], ['guid' => $a->argv[1], 'private' => false]);
+ if (!DBA::isResult($item) || !strstr($item['author-link'], System::baseUrl())) {
+ System::httpExit(404);
+ }
}
$data = ActivityPub\Transmitter::createObjectFromItemID($item['id']);
diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index d177e81d3..0487cc733 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -237,11 +237,13 @@ function frio_remote_nav($a, &$nav)
} elseif (!local_user() && remote_user()) {
$r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
$nav['remote'] = L10n::t('Guest');
+ $remoteUser = $r[0];
} elseif (Model\Profile::getMyURL()) {
$r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`
WHERE `addr` = '%s' AND `network` = 'dfrn'",
DBA::escape($webbie));
$nav['remote'] = L10n::t('Visitor');
+ $remoteUser = $r[0];
} else {
$r = false;
}
@@ -257,10 +259,10 @@ function frio_remote_nav($a, &$nav)
$nav['logout'] = [$server_url . '/logout', L10n::t('Logout'), '', L10n::t('End this session')];
// user menu
- $nav['usermenu'][] = [$server_url . '/profile/' . $a->user['nickname'], L10n::t('Status'), '', L10n::t('Your posts and conversations')];
- $nav['usermenu'][] = [$server_url . '/profile/' . $a->user['nickname'] . '?tab=profile', L10n::t('Profile'), '', L10n::t('Your profile page')];
- $nav['usermenu'][] = [$server_url . '/photos/' . $a->user['nickname'], L10n::t('Photos'), '', L10n::t('Your photos')];
- $nav['usermenu'][] = [$server_url . '/videos/' . $a->user['nickname'], L10n::t('Videos'), '', L10n::t('Your videos')];
+ $nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'], L10n::t('Status'), '', L10n::t('Your posts and conversations')];
+ $nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '?tab=profile', L10n::t('Profile'), '', L10n::t('Your profile page')];
+ $nav['usermenu'][] = [$server_url . '/photos/' . $remoteUser['nick'], L10n::t('Photos'), '', L10n::t('Your photos')];
+ $nav['usermenu'][] = [$server_url . '/videos/' . $remoteUser['nick'], L10n::t('Videos'), '', L10n::t('Your videos')];
$nav['usermenu'][] = [$server_url . '/events/', L10n::t('Events'), '', L10n::t('Your events')];
// navbar links
diff --git a/view/theme/quattro/templates/nav.tpl b/view/theme/quattro/templates/nav.tpl
index f002e72fe..cb5412c16 100644
--- a/view/theme/quattro/templates/nav.tpl
+++ b/view/theme/quattro/templates/nav.tpl
@@ -2,7 +2,7 @@
{{* {{$langselector}} *}}