Merge pull request #9517 from annando/no-duplicated

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index d630d94a04ebb9722374ea2cdf1e975300e28dcc..945880dffae645dbc13de3821f120e8cafc69cf7 100644 (file)
--- 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) {