X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=945880dffae645dbc13de3821f120e8cafc69cf7;hb=b1bc8ebbfa6d978a48c98c278d1b6081cbcd4ea8;hp=d630d94a04ebb9722374ea2cdf1e975300e28dcc;hpb=d9c6a46ffee7f0544a8da195243f524623ddc107;p=friendica.git diff --git a/mod/display.php b/mod/display.php index d630d94a04..945880dffa 100644 --- a/mod/display.php +++ b/mod/display.php @@ -164,7 +164,7 @@ function display_fetchauthor($a, $item) $profiledata["about"] = ""; } - $profiledata = array_merge($profiledata, Contact::getByURLForUser($profiledata["url"], local_user(), [], false)); + $profiledata = Contact::getByURLForUser($profiledata["url"], local_user()) ?: $profiledata; if (!empty($profiledata["photo"])) { $profiledata["photo"] = DI::baseUrl()->remove($profiledata["photo"]); @@ -238,6 +238,10 @@ function display_content(App $a, $update = false, $update_uid = 0) throw new HTTPException\NotFoundException(DI::l10n()->t('The requested item doesn\'t exist or has been deleted.')); } + if (!DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) { + DBA::update('notify', ['seen' => true], ['parent' => $item['parent'], 'uid' => local_user()]); + } + // We are displaying an "alternate" link if that post was public. See issue 2864 $is_public = Item::exists(['id' => $item_id, 'private' => [Item::PUBLIC, Item::UNLISTED]]); if ($is_public) {