Merge pull request #9995 from annando/issue-9948

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 0c252cd6cdc83f025339484324b5f03a6278e17e..7c11d7311a125c393b19530aa1d5a83124084d8a 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -651,7 +651,6 @@ function item_post(App $a) {
                // doesn't have an ID.
                $datarray["id"] = -1;
                $datarray["uri-id"] = -1;
-               $datarray["item_id"] = -1;
                $datarray["author-network"] = Protocol::DFRN;
 
                $o = conversation($a, [array_merge($contact_record, $datarray)], 'search', false, true);
@@ -782,7 +781,7 @@ function item_post(App $a) {
        // When we are doing some forum posting via ! we have to start the notifier manually.
        // These kind of posts don't initiate the notifier call in the item class.
        if ($only_to_forum) {
-               Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => false], "Notifier", Delivery::POST, $post_id);
+               Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => false], "Notifier", Delivery::POST, (int)$datarray['uri-id'], (int)$datarray['uid']);
        }
 
        Logger::info('post_complete');
@@ -848,12 +847,7 @@ function item_content(App $a)
                                throw new HTTPException\NotFoundException('Item not found');
                        }
 
-                       $cdata = Contact::getPublicAndUserContacID($item['author-id'], local_user());
-                       if (empty($cdata['user'])) {
-                               throw new HTTPException\NotFoundException('Contact not found');
-                       }
-
-                       Contact::block($cdata['user'], DI::l10n()->t('Blocked on item with guid %s', $item['guid']));
+                       Contact\User::setBlocked($item['author-id'], local_user(), true);
 
                        if (DI::mode()->isAjax()) {
                                // ajax return: [<item id>, 0 (no perm) | <owner id>]