Merge pull request #8742 from MrPetovan/task/blocklist-safelist

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index f074111442268420d50244f51d85546be221f06f..b023b97d19ef5a014edf9192dfc5494def96a27b 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -100,14 +100,9 @@ function item_post(App $a) {
        $toplevel_item_id = intval($_REQUEST['parent'] ?? 0);
        $thr_parent_uri = trim($_REQUEST['parent_uri'] ?? '');
 
-       $thread_parent_uriid = 0;
-       $thread_parent_contact = null;
-
        $toplevel_item = null;
        $parent_user = null;
 
-       $parent_contact = null;
-
        $objecttype = null;
        $profile_uid = ($_REQUEST['profile_uid'] ?? 0) ?: local_user();
        $posttype = ($_REQUEST['post_type'] ?? '') ?: Item::PT_ARTICLE;
@@ -122,11 +117,9 @@ function item_post(App $a) {
                // if this isn't the top-level parent of the conversation, find it
                if (DBA::isResult($toplevel_item)) {
                        // The URI and the contact is taken from the direct parent which needn't to be the top parent
-                       $thread_parent_uriid = $toplevel_item['uri-id'];
                        $thr_parent_uri = $toplevel_item['uri'];
-                       $thread_parent_contact = Contact::getDetailsByURL($toplevel_item["author-link"]);
 
-                       if ($toplevel_item['id'] != $toplevel_item['parent']) {
+                       if ($toplevel_item['gravity'] != GRAVITY_PARENT) {
                                $toplevel_item = Item::selectFirst([], ['id' => $toplevel_item['parent']]);
                        }
                }
@@ -252,7 +245,7 @@ function item_post(App $a) {
                $verb              = $orig_post['verb'];
                $objecttype        = $orig_post['object-type'];
                $app               = $orig_post['app'];
-               $categories        = $orig_post['file'];
+               $categories        = $orig_post['file'] ?? '';
                $title             = Strings::escapeTags(trim($_REQUEST['title']));
                $body              = trim($body);
                $private           = $orig_post['private'];
@@ -657,6 +650,7 @@ function item_post(App $a) {
                // We set the datarray ID to -1 because in preview mode the dataray
                // doesn't have an ID.
                $datarray["id"] = -1;
+               $datarray["uri-id"] = -1;
                $datarray["item_id"] = -1;
                $datarray["author-network"] = Protocol::DFRN;
 
@@ -744,7 +738,7 @@ function item_post(App $a) {
 
        Tag::storeFromBody($datarray['uri-id'], $datarray['body']);
 
-       if (!\Friendica\Content\Feature::isEnabled($uid, 'explicit_mentions')) {
+       if (!\Friendica\Content\Feature::isEnabled($uid, 'explicit_mentions') && ($datarray['gravity'] == GRAVITY_COMMENT)) {
                Tag::createImplicitMentions($datarray['uri-id'], $datarray['thr-parent-id']);
        }