Merge pull request #4618 from tobiasd/210180317-htconfig

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 5489964161dcd04ee61bbf367bed77dd3316df35..8aa7c665af8733df7cbb873f35818698192f76fe 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -24,7 +24,6 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
-use Friendica\Model\GContact;
 use Friendica\Model\Item;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
@@ -230,7 +229,7 @@ function item_post(App $a) {
                $verb              = notags(trim($_REQUEST['verb']));
                $emailcc           = notags(trim($_REQUEST['emailcc']));
                $body              = escape_tags(trim($_REQUEST['body']));
-               $network           = notags(trim($_REQUEST['network']));
+               $network           = notags(trim(defaults($_REQUEST, 'network', NETWORK_DFRN)));
                $guid              = get_guid(32);
 
                $postopts = defaults($_REQUEST, 'postopts', '');
@@ -594,11 +593,11 @@ function item_post(App $a) {
        $datarray['owner-name']    = $contact_record['name'];
        $datarray['owner-link']    = $contact_record['url'];
        $datarray['owner-avatar']  = $contact_record['thumb'];
-       $datarray['owner-id']      = Contact::getIdForURL($datarray['owner-link'], 0);
+       $datarray['owner-id']      = Contact::getIdForURL($datarray['owner-link']);
        $datarray['author-name']   = $author['name'];
        $datarray['author-link']   = $author['url'];
        $datarray['author-avatar'] = $author['thumb'];
-       $datarray['author-id']     = Contact::getIdForURL($datarray['author-link'], 0);
+       $datarray['author-id']     = Contact::getIdForURL($datarray['author-link']);
        $datarray['created']       = DateTimeFormat::utcNow();
        $datarray['edited']        = DateTimeFormat::utcNow();
        $datarray['commented']     = DateTimeFormat::utcNow();
@@ -632,8 +631,6 @@ function item_post(App $a) {
        $datarray['postopts']      = $postopts;
        $datarray['origin']        = $origin;
        $datarray['moderated']     = false;
-       $datarray['gcontact-id']   = GContact::getId(["url" => $datarray['author-link'], "network" => $datarray['network'],
-                                                       "photo" => $datarray['author-avatar'], "name" => $datarray['author-name']]);
        $datarray['object']        = $object;
 
        /*