Merge remote-tracking branch 'upstream/develop' into item-view

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index d3c0e024996d95fb37b512c339671b03e768c0eb..81dce59e2f8fcfe5159c18ca320c3d57d325eb89 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -164,7 +164,7 @@ function display_fetchauthor($a, $item)
                $profiledata["about"] = "";
        }
 
-       $profiledata = Contact::getDetailsByURL($profiledata["url"], local_user(), $profiledata);
+       $profiledata = Contact::getByURLForUser($profiledata["url"], local_user()) ?: $profiledata;
 
        if (!empty($profiledata["photo"])) {
                $profiledata["photo"] = DI::baseUrl()->remove($profiledata["photo"]);
@@ -183,9 +183,11 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
        $item = null;
 
+       $force = (bool)($_REQUEST['force'] ?? false);
+
        if ($update) {
                $item_id = $_REQUEST['item_id'];
-               $item = Item::selectFirst(['uid', 'parent', 'parent-uri'], ['id' => $item_id]);
+               $item = Item::selectFirst(['uid', 'parent', 'parent-uri', 'parent-uri-id'], ['id' => $item_id]);
                if ($item['uid'] != 0) {
                        $a->profile = ['uid' => intval($item['uid'])];
                } else {
@@ -199,7 +201,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
                if ($a->argc == 2) {
                        $item_parent = 0;
-                       $fields = ['id', 'parent', 'parent-uri', 'uid'];
+                       $fields = ['id', 'parent', 'parent-uri', 'parent-uri-id', 'uid'];
 
                        if (local_user()) {
                                $condition = ['guid' => $a->argv[1], 'uid' => local_user()];
@@ -236,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-uri-id' => $item['parent-uri-id'], '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) {
@@ -281,7 +287,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
        }
 
        // We need the editor here to be able to reshare an item.
-       if ($is_owner) {
+       if ($is_owner && !$update) {
                $x = [
                        'is_owner' => true,
                        'allow_location' => $a->user['allow_location'],
@@ -304,7 +310,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
                $unseen = false;
        }
 
-       if ($update && !$unseen) {
+       if ($update && !$unseen && !$force) {
                return '';
        }